Merge "Skip NetworkStatsServiceTest before T" am: fc67ee8c71
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1990891
Change-Id: I5de3ecb76ce3b4c745c39c4486ba75f2ca9c046e
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-02-19 20:42:07 +00:00
a969e7eadd
Merge "Add tests for deleteKernelTagData" am: 8bf31e8061
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1972803
Change-Id: I0d0d4aa20d8349b9b9afd5aea38e16f2ed6cabc7
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-02-19 20:42:05 +00:00
d012f2948b
Merge "Skip NetworkStatsServiceTest before T"
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2022-02-19 20:20:24 +00:00
fc67ee8c71
Skip NetworkStatsServiceTest before T
...
NetworkStatsService was mainlined in T, so the test does not need to be
run on previous Android versions.
Test: atest CtsNetTestCases:NetworkStatsServiceTest
Change-Id: I8e69746a03ef029b1121cc8fa71e299ac12c2905
Patrick Rohr
commited 2022-02-18 09:18:20 +01:00
e3b067f523
Merge "Fix NetworkStatsServiceTest after adding deleteKernelTagData" am: 3226bfb631
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1968682
Change-Id: If41fe23391b30992b12b8b37593442e2f6cb1906
Patrick Rohr
authored and
Automerger Merge Worker
commited 2022-02-16 20:35:24 +00:00
d496e9f60e
Add tests for deleteKernelTagData
...
Test: atest NetworkStatsServiceTest
Change-Id: I6db6b79314868271f877acf2a0b21699cbf02df5
Patrick Rohr
authored and
markchien
commited 2022-02-16 14:23:30 +08:00
f9888898e3
Fix NetworkStatsServiceTest after adding deleteKernelTagData
...
Test: atest NetworkStatsServiceTest
Change-Id: I667a5d86e0df8505fef549e598f3b4141637fb90
Patrick Rohr
authored and
markchien
commited 2022-02-16 14:01:29 +08:00
7c52b69b3e
Merge "Add Low Power Standby test to NetworkManagementServiceTest" am: 3a33495992
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1963392
Change-Id: I42140d6ea97cec4899a6299373942ed8950e3f52
Robert Horvath
authored and
Automerger Merge Worker
commited 2022-02-10 11:30:34 +00:00
e5dd237590
Merge "Add Low Power Standby test to NetworkManagementServiceTest"
Robert Horvath
authored and
Gerrit Code Review
commited 2022-02-10 11:17:44 +00:00
3a33495992
Merge changes from topic "bandwidth-limiting" am: 6b5b7b40d8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1955585
Change-Id: I25ed7de950778a281bca5afd842126fccad3c7e0
Patrick Rohr
authored and
Automerger Merge Worker
commited 2022-02-09 18:16:08 +00:00
4eeea56e39
Merge changes from topic "bandwidth-limiting"
...
* changes:
Add bandwidth limiting to CS
Add setting that controls network rate limit
Patrick Rohr
authored and
Gerrit Code Review
commited 2022-02-09 18:00:04 +00:00
6b5b7b40d8
Merge "Pass the NetworkAgentConfig to NetworkMonitor." am: ec05b337aa
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1973860
Change-Id: I632b38bacd43ce03b95a163b4742b1a414b79012
Jean Chalard
authored and
Automerger Merge Worker
commited 2022-02-09 17:12:02 +00:00
33235c723e
Add bandwidth limiting to CS
...
Adds ingress rate limiting functionality to ConnectivityService. The tc
rate limit is installed before we tell netd about the interface, and
removed after the network is removed from netd. When the setting
changes, the old rate limit needs to be removed before a new one can be
added (unfortunately, we cannot use NLM_F_REPLACE when configuring the
tc-police filter).
Currently, this functionality is always enabled, but may or may not work
based on kernel support.
Bug: 157552970
Test: atest FrameworksNetTests:ConnectivityServiceTest
Change-Id: I4e64b2c40490f061e42b40a1b1b3a6618c3d1a87
Patrick Rohr
commited 2022-02-09 14:46:26 +01:00
2857ac4dd0
Pass the NetworkAgentConfig to NetworkMonitor.
...
When the network is a VPN, NetworkMonitor needs to know whether
the VPN requests validation, and that information is stored in
NetworkAgentConfig. Pass it.
Test: FrameworksNetTests
Change-Id: I3616f0796b69ce054d92213aafdef43ba7041596
Chalard Jean
commited 2022-02-09 15:19:38 +09:00
d490072cd6
Merge "Use RECEIVER_NOT_EXPORTED in CarrierPrivilegeAuthenticator." am: d262e71965
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1970499
Change-Id: I5fadd544619ea315a16eed9cfa6b6e5a70e01cd6
Jean Chalard
authored and
Automerger Merge Worker
commited 2022-02-04 16:53:37 +00:00
f3f151f798
Merge "Use RECEIVER_NOT_EXPORTED in CarrierPrivilegeAuthenticator."
Jean Chalard
authored and
Gerrit Code Review
commited 2022-02-04 16:40:30 +00:00
d262e71965
Merge "Add APIs for discover/resolve on specific networks" am: d61719c422
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1944726
Change-Id: I5d6e69d78a54be962134d62262ec0938280ea8d0
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2022-02-04 12:18:44 +00:00
5baa9f74ca
Merge "Add APIs for discover/resolve on specific networks"
Remi NGUYEN VAN
authored and
Gerrit Code Review
commited 2022-02-04 12:07:38 +00:00
d61719c422
Use RECEIVER_NOT_EXPORTED in CarrierPrivilegeAuthenticator.
...
Passing one of RECEIVER_EXPORTED or RECEIVER_NOT_EXPORTED is
required for all code targeting T or above. The correct value
here is RECEIVER_NOT_EXPORTED because the receiver is being
registered in the system server and the broadcast comes from
the system server itself (same UID).
This does not need to be guarded by OS version because
CarrierPrivilegeAuthenticator is only used on T+.
Test: m
Fix: 217642082
Change-Id: I09840b17bd54352896607737b56c6a692ffbd2c2
Lorenzo Colitti
authored and
Chalard Jean
commited 2022-02-04 15:31:06 +09:00
7569d51446
Add APIs for discover/resolve on specific networks
...
Test that NsdManager specifies the correct network when a service is
discovered, and that services can be resolved on a specified network.
Also test that service discovery can be started on a specific network.
Bug: 190249673
Test: atest NsdManagerTest
Change-Id: Ie8b551ce9e33e3adf35f75508f91bbd0df71f837
Remi NGUYEN VAN
commited 2022-02-03 16:05:02 +09:00
06bdcec9fa
Add Low Power Standby test to NetworkManagementServiceTest
...
Bug: 190822356
Test: atest NetworkManagementServiceTest
Change-Id: I8ee0f5bc77efb94ba04957f68ec9b829d41bff83
Robert Horvath
commited 2022-02-02 22:54:21 +01:00
aa197190c6
Merge changes Ic6a1aa92,I685f924a,I50fab91e am: 2bc73d3b18
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1936492
Change-Id: Id1883f7c7209ad1e8ab5bd097467886d897116a2
Jean Chalard
authored and
Automerger Merge Worker
commited 2022-02-02 07:54:21 +00:00
15d3140a33
Accept accessUids from telephony when it's the carrier config app
...
Test: FrameworksNetTests, new test in this patch
Change-Id: I50fab91e107c51d33a5e529c73b83db198a88d2c
Chalard Jean
commited 2022-02-02 13:52:25 +09:00
ac9ace0bbe
Merge "Clean up BpfNetMaps" am: d36de12652
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1962620
Change-Id: I3351f56844a9b48ff4f77d2e7cc723102e255745
Treehugger Robot
authored and
Automerger Merge Worker
commited 2022-02-01 13:08:33 +00:00
33a41b8d64
Clean up BpfNetMaps
...
Cleans up BpfNetMaps.java before enabling mainline code path.
Bug: 202086915
Test: atest FrameworksNetTests
Change-Id: I28e5d63ed4624df540b1ca47b71899cff7321ded
Ken Chen
authored and
Patrick Rohr
commited 2022-02-01 12:31:03 +01:00
f5f51339af
Merge changes Ifd6be50a,I857e40c9,I1b9f4fde,Ib3b43cf2 am: 76709a18e9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1966602
Change-Id: I172654f1eb824ce8a241ef3551d31b1385fa5365
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-02-01 03:17:27 +00:00
f0a36ba740
Merge changes Ifd6be50a,I857e40c9,I1b9f4fde,Ib3b43cf2
...
* changes:
Prevent native_init from starting TrafficController
Remove libutils dependency from libservice-connectivity
Merge libtraffic_controller_jni into libservice-connectivity
[NETD-TC#15] Make ConnectivityService and PermissionMonitor calls BpfNetMaps on T
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2022-02-01 03:02:36 +00:00
76709a18e9
Merge changes Id5e5b911,I8301abad,I7262811a,I658e579b,I7d43ef0e am: 4fcb8ad292
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958935
Change-Id: I923bebc0438371fdc0a5d95d2a7a1485079a0b5a
Jean Chalard
authored and
Automerger Merge Worker
commited 2022-02-01 01:01:58 +00:00
5f780da415
Merge changes Id5e5b911,I8301abad,I7262811a,I658e579b,I7d43ef0e
...
* changes:
Expose access UIDs.
Send access UIDs to netd
Add accessUids to NetworkCapabilities.
Clean up restrictions on network agent capabilities
Sanitize NetworkCapabilities from agent on the handler thread
Jean Chalard
authored and
Gerrit Code Review
commited 2022-02-01 00:45:55 +00:00
4fcb8ad292
Merge "Fix kernelToTag import in NetworkStatsFactoryTest." am: d508855bb9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1965521
Change-Id: I7dc3f917b38283eac67b7f9d2185355850857d52
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2022-01-31 14:04:01 +00:00
f99ca92278
Merge "Fix kernelToTag import in NetworkStatsFactoryTest."
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2022-01-31 13:35:30 +00:00
d508855bb9
[NETD-TC#15] Make ConnectivityService and PermissionMonitor
...
calls BpfNetMaps on T
Since TrafficController moves to mainline module for T, so some netd binder
interfaces revelant to BPF are going to deprecated. Provide JNI APIs to
call TrafficController inside mainline module for T.
Bug: 209935649
Test: atest CtsHostsideNetworkTests
Change-Id: Ib3b43cf2840e02806395af9f1e019ca6fccd032e
Wayne Ma
authored and
Patrick Rohr
commited 2022-01-31 09:19:08 +01:00
2fde98c87b
Send access UIDs to netd
...
Test: FrameworkNetTests CtsNetTestCases
Change-Id: I8301abaddf5850071fa23d41e8e736ab7071e299
Chalard Jean
commited 2022-01-31 17:04:58 +09:00
e6c9527554
Add accessUids to NetworkCapabilities.
...
For now, all entry points reject this. Followup changes
will allow the supported use cases.
Test: new unit tests and CTS for this in this patch
Change-Id: I7262811a2e46336d3bb63c80886fc0578a36da94
Chalard Jean
commited 2022-01-31 17:04:58 +09:00
9a30acf744
Allow Carrier app to request for CBS capability am: e9cd2084e4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1950396
Change-Id: I5b58c6c9e7eb6c1f43417923abd7ad32eb5f1c96
Sooraj Sasindran
authored and
Automerger Merge Worker
commited 2022-01-31 00:59:07 +00:00
42ba1af05c
Allow Carrier app to request for CBS capability
...
Test: unit test and CTS
Bug: 194332512
Change-Id: I29680b56d790106ad082f1a398c2bddb030f834a
Sooraj Sasindran
commited 2022-01-30 12:12:17 -08:00
e9cd2084e4
Fix kernelToTag import in NetworkStatsFactoryTest.
...
NetworkManagementSocketTagger#kernelToTag is moving to
NetworkStatsFactory. Fix the import path in the test.
Test: atest FrameworksNetTest
Change-Id: I8797d9e589e68b4980ff5b38ba09d091420d30fd
Lorenzo Colitti
commited 2022-01-29 21:35:06 +09:00
f59770f769
Merge "Adjust NetworkStatsServiceTest to mock out the JNI." am: c5ad7cd775
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1964822
Change-Id: I60785b009973468ea2564b3474d1e39c32e12e3d
Treehugger Robot
authored and
Automerger Merge Worker
commited 2022-01-28 12:07:44 +00:00
38733baa0e
Adjust NetworkStatsServiceTest to mock out the JNI.
...
Test: atest NetworkStatsServiceTest
Change-Id: Icdea9f871199f1e859aef647e5ba3dec7ac02d73
Lorenzo Colitti
commited 2022-01-28 18:16:39 +09:00
9fdbb7ec7d
Merge "Test UidCounterSetMap in NetworkStatsServiceTest" am: dd26c5709e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961303
Change-Id: I3542978192829d265cc582c8c2d20c3cb60f4c86
Mark Chien
authored and
Automerger Merge Worker
commited 2022-01-27 10:46:56 +00:00
8123e528e7
Merge "Test UidCounterSetMap in NetworkStatsServiceTest"
Mark Chien
authored and
Gerrit Code Review
commited 2022-01-27 10:02:35 +00:00
dd26c5709e
Test UidCounterSetMap in NetworkStatsServiceTest
...
Test: atest FrameworksNetTests
Change-Id: I1ae720fcc3192712b3dcbe69619f97f7df1a1f5e
markchien
commited 2022-01-27 17:28:19 +08:00
8f3917501b
Merge "Change NETWORK_TYPE_5G_NSA reference package" am: 85a2ef3dd5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961305
Change-Id: I5c61e698271f010416dc2b061e14c62fe86255b8
Aaron Huang
authored and
Automerger Merge Worker
commited 2022-01-27 08:58:08 +00:00
27fba62481
Merge "Change NETWORK_TYPE_5G_NSA reference package"
Aaron Huang
authored and
Gerrit Code Review
commited 2022-01-27 08:36:23 +00:00
85a2ef3dd5
Change NETWORK_TYPE_5G_NSA reference package
...
NETWORK_TYPE_5G_NSA is moved to NetworkStatsManager
Bug: 210073043
Test: builds, FrameworksNetTests
Change-Id: I9226119ee4f67688a1b4ffdab7e5a86ec0b8e974
Aaron Huang
commited 2022-01-26 23:41:17 +08:00
b4ce0fa9b1
Merge changes Ie826477d,I5125a3ac am: f8ed984e9c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961299
Change-Id: Ifd238b453ad75085217b70afdbe35f8766644218
Nucca Chen
authored and
Automerger Merge Worker
commited 2022-01-26 15:04:34 +00:00
739bf2569f
Merge changes Ie826477d,I5125a3ac
...
* changes:
[CLATJ#26] ClatCoordinator: reword clatd starting failure logging
[CLATJ#25] ClatCoordinator: stop clatd process gracefully
Nucca Chen
authored and
Gerrit Code Review
commited 2022-01-26 14:50:11 +00:00
f8ed984e9c
[CLATJ#26] ClatCoordinator: reword clatd starting failure logging
...
Bug: 212345928
Test: build
Change-Id: Ie826477d27db26cc49d113ec8bfacaaa3006e26e
Hungming Chen
authored and
Nucca Chen
commited 2022-01-26 12:23:45 +00:00
6fb21144b8
Merge changes from topic "preparation_fork_clatd_from_system_server" am: 43f9729e90
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934178
Change-Id: I5f26eaaf16faf055a63cdd1b2bb4a973c20317c0
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-01-26 00:40:49 +00:00
3723e300fc
Merge changes from topic "preparation_fork_clatd_from_system_server"
...
* changes:
[CLATJ#24] ClatCoordinatorTest: add basic unit tests
[CLATJ#23] Close the file descriptor manually
[CLATJ#22] ClatCoordinator: stop clatd
[CLATJ#21] ClatCoordinator: start clatd
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2022-01-26 00:26:48 +00:00
43f9729e90