Commit Graph

1938 Commits

Author SHA1 Message Date
Lorenzo Colitti
d508855bb9 Merge "Fix kernelToTag import in NetworkStatsFactoryTest." 2022-01-31 13:35:30 +00:00
Wayne Ma
2fde98c87b [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
2022-01-31 09:19:08 +01:00
Chalard Jean
e6c9527554 Send access UIDs to netd
Test: FrameworkNetTests CtsNetTestCases
Change-Id: I8301abaddf5850071fa23d41e8e736ab7071e299
2022-01-31 17:04:58 +09:00
Chalard Jean
9a30acf744 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
2022-01-31 17:04:58 +09:00
Sooraj Sasindran
42ba1af05c 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
2022-01-31 00:59:07 +00:00
Sooraj Sasindran
e9cd2084e4 Allow Carrier app to request for CBS capability
Test: unit test and CTS
Bug: 194332512
Change-Id: I29680b56d790106ad082f1a398c2bddb030f834a
2022-01-30 12:12:17 -08:00
Lorenzo Colitti
f59770f769 Fix kernelToTag import in NetworkStatsFactoryTest.
NetworkManagementSocketTagger#kernelToTag is moving to
NetworkStatsFactory. Fix the import path in the test.

Test: atest FrameworksNetTest
Change-Id: I8797d9e589e68b4980ff5b38ba09d091420d30fd
2022-01-29 21:35:06 +09:00
Treehugger Robot
38733baa0e 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
2022-01-28 12:07:44 +00:00
Lorenzo Colitti
9fdbb7ec7d Adjust NetworkStatsServiceTest to mock out the JNI.
Test: atest NetworkStatsServiceTest
Change-Id: Icdea9f871199f1e859aef647e5ba3dec7ac02d73
2022-01-28 18:16:39 +09:00
Mark Chien
8123e528e7 Merge "Test UidCounterSetMap in NetworkStatsServiceTest" am: dd26c5709e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961303

Change-Id: I3542978192829d265cc582c8c2d20c3cb60f4c86
2022-01-27 10:46:56 +00:00
Mark Chien
dd26c5709e Merge "Test UidCounterSetMap in NetworkStatsServiceTest" 2022-01-27 10:02:35 +00:00
Junyu Lai
11124c2106 Merge "[MS59.2] Add unit test for NetworkStatsDataMigrationUtils" am: bfdd0f3c3c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958907

Change-Id: Ie4255d82cf593a848e1ef64c88dd43e5839b955e
2022-01-27 09:35:03 +00:00
markchien
8f3917501b Test UidCounterSetMap in NetworkStatsServiceTest
Test: atest FrameworksNetTests
Change-Id: I1ae720fcc3192712b3dcbe69619f97f7df1a1f5e
2022-01-27 17:28:19 +08:00
Junyu Lai
bfdd0f3c3c Merge "[MS59.2] Add unit test for NetworkStatsDataMigrationUtils" 2022-01-27 09:20:10 +00:00
Aaron Huang
27fba62481 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
2022-01-27 08:58:08 +00:00
Aaron Huang
85a2ef3dd5 Merge "Change NETWORK_TYPE_5G_NSA reference package" 2022-01-27 08:36:23 +00:00
junyulai
a1bb3a36cd [MS59.2] Add unit test for NetworkStatsDataMigrationUtils
Test: atest NetworkStatsDataMigrationUtilsTest
Bug: 204830222
Change-Id: Ia6e8aec9a828072a2a1e63bec600c2e20d3699b3
2022-01-26 16:53:06 +00:00
Aaron Huang
b4ce0fa9b1 Change NETWORK_TYPE_5G_NSA reference package
NETWORK_TYPE_5G_NSA is moved to NetworkStatsManager

Bug: 210073043
Test: builds, FrameworksNetTests
Change-Id: I9226119ee4f67688a1b4ffdab7e5a86ec0b8e974
2022-01-26 23:41:17 +08:00
Nucca Chen
739bf2569f Merge changes Ie826477d,I5125a3ac am: f8ed984e9c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961299

Change-Id: Ifd238b453ad75085217b70afdbe35f8766644218
2022-01-26 15:04:34 +00:00
Nucca Chen
f8ed984e9c Merge changes Ie826477d,I5125a3ac
* changes:
  [CLATJ#26] ClatCoordinator: reword clatd starting failure logging
  [CLATJ#25] ClatCoordinator: stop clatd process gracefully
2022-01-26 14:50:11 +00:00
Hungming Chen
6fb21144b8 [CLATJ#26] ClatCoordinator: reword clatd starting failure logging
Bug: 212345928
Test: build
Change-Id: Ie826477d27db26cc49d113ec8bfacaaa3006e26e
2022-01-26 12:23:45 +00:00
Junyu Lai
9010433afa [MS78.2] Fix NetworkIdentity#Builder crashing on 5G NSA networks am: 30f06afda3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958895

Change-Id: I8ca8ead338d624af815bd4568b1b02aa7a9e88c6
2022-01-26 10:46:37 +00:00
Junyu Lai
30f06afda3 [MS78.2] Fix NetworkIdentity#Builder crashing on 5G NSA networks
Test: atest NetworkIdentityTest
Fix: 216193400
Change-Id: I00abc97a98dfdf17d5f0c2e6b45d28be9899c5c3
2022-01-26 07:53:57 +00:00
Maciej Żenczykowski
3723e300fc 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
2022-01-26 00:40:49 +00:00
Maciej Żenczykowski
43f9729e90 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
2022-01-26 00:26:48 +00:00
Junyu Lai
a10e284925 Merge "[DU09-1]Adding the NetworkStatsCollection Builder" am: 41483efa02
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1957862

Change-Id: I4c3a0aa8b9581f2e7851d19e2971ab9bda0b71ef
2022-01-25 16:59:40 +00:00
Junyu Lai
41483efa02 Merge "[DU09-1]Adding the NetworkStatsCollection Builder" 2022-01-25 16:44:16 +00:00
Junyu Lai
b26c3ea08b Merge "[MS68.2] Adapt NetworkPolicyManagerService to use registerUsageCallback" am: bc8328bda4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958899

Change-Id: I32b46c02a38f8427589887f44a009d4c654a5c01
2022-01-25 13:51:41 +00:00
Junyu Lai
bc8328bda4 Merge "[MS68.2] Adapt NetworkPolicyManagerService to use registerUsageCallback" 2022-01-25 13:30:57 +00:00
Hungming Chen
358d582730 [CLATJ#24] ClatCoordinatorTest: add basic unit tests
Introduce ClatCoordinatorTest for unit tests of class ClatCoordinator.
Add the tests:
- testStartStopClatd
- testGetFwmark
- testAdjustMtu

Bug: 212345928
Test: atest FrameworksNetTests
Change-Id: I6908eac05b14077b450d51e1432d340c8a247eb1
2022-01-25 20:32:25 +08:00
Frank
c8856596c5 [DU09-1]Adding the NetworkStatsCollection Builder
The purpose is provide NetworkStatsCollection.Builder as
public API for adding the stats {@link NetworkStatsHistory}

Bug: 215862801
Test: atest NetworkStatsCollectionTest
Change-Id: Id83c6fa67880ba361b8e0e15c4d86b90e44ac879
2022-01-25 19:43:23 +08:00
Mark Chien
2e42a1e5e9 Merge "Replace some netd calls in NetworkManagementService" am: 7586d33f22
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1949805

Change-Id: Id4455e3090e555667d15461fc33fecf5333079bd
2022-01-25 03:47:52 +00:00
Mark Chien
99e5e8102d Merge "Replace INetd#trafficSwapActiveStatsMap with ConnectivityManager API" am: f3cf7c00a6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1949804

Change-Id: I3f0d37493a44cb4f3488b747a039a3c9e60c33ac
2022-01-25 03:47:34 +00:00
Mark Chien
7586d33f22 Merge "Replace some netd calls in NetworkManagementService" 2022-01-25 03:34:54 +00:00
Mark Chien
f3cf7c00a6 Merge "Replace INetd#trafficSwapActiveStatsMap with ConnectivityManager API" 2022-01-25 03:34:14 +00:00
Junyu Lai
ba4588b638 Merge "[MS67.2] Modify tests for registerUsageCallback" am: 3f9584bfda
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958145

Change-Id: I1986a2bd9096c98378ee4b85a9150d7d0fc27a6f
2022-01-25 01:37:22 +00:00
Junyu Lai
3f9584bfda Merge "[MS67.2] Modify tests for registerUsageCallback" 2022-01-25 01:23:45 +00:00
Maciej Żenczykowski
6c6cf9fecb Merge "Add unit test for BpfInterfaceMapUpdate" am: d512ec646c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1956062

Change-Id: I459e219d0940c85d58577de5dedfc5deab3d143e
2022-01-24 19:23:45 +00:00
Maciej Żenczykowski
d512ec646c Merge "Add unit test for BpfInterfaceMapUpdate" 2022-01-24 19:05:28 +00:00
Sooraj Sasindran
59d67460af Merge "Add support for Multiple enterprise slice" am: 0311ea0bc6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1905552

Change-Id: If5236959716beeb70e91c4831949325e8a53d099
2022-01-24 16:41:19 +00:00
Sooraj Sasindran
0311ea0bc6 Merge "Add support for Multiple enterprise slice" 2022-01-24 16:26:03 +00:00
junyulai
0a007c248c [MS68.2] Adapt NetworkPolicyManagerService to use registerUsageCallback
This change also address comments at aosp/1958145.

Test: atest FrameworksNetTests
Bug: 204830222
Change-Id: I415d74df34caa91b1e1160478ebff30fbd1c7b6f
2022-01-24 22:12:42 +08:00
junyulai
f8a1d3e5e6 [MS67.2] Modify tests for registerUsageCallback
Test: atest FrameworksNetTests
Bug: 204830222
Change-Id: Ia4ff535cd703807516d65b582727684cbb670360
2022-01-24 18:59:23 +08:00
Junyu Lai
bc0d70f6b1 Merge changes from topics "ms56-historybuilder", "ms65.3" am: 4794105511
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951102

Change-Id: I6ef265c5f23be31ce0a191edea9998abaa9c6182
2022-01-24 05:58:06 +00:00
Junyu Lai
6d95db48d0 [MS56.2] Add unit test for NetworkStatsHistory#Builder
Test: atest NetworkStatsHistoryTest#testBuilder
Bug: 204830222
Change-Id: Id876340bcab7290d5e191dbdfcce7fb4d8ecf96c
2022-01-23 20:52:31 +08:00
Junyu Lai
84413a92c3 [MS65.4] Address comments at aosp/1954383
Test: atest NetworkIdentityTest#testBuilder
Bug: 204830222
Change-Id: I3d0f8175ee782c76839cbbdb5eb8a1219a61d874
2022-01-23 20:52:31 +08:00
Les Lee
5119944e72 wifi data usage: Update calling API name am: c71f2d7425
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1957863

Change-Id: Ie1767815373e8225ada360288816690f82a7fbe0
2022-01-23 00:46:53 +00:00
Sooraj Sasindran
f4a58dcd45 Add support for Multiple enterprise slice
Bug: 194332512
Test: unit test
CTS-Coverage-Bug: 211133973
Change-Id: Ie8be08a7cfa9155168d1da146d02fd1643248bdc
2022-01-22 14:39:40 -08:00
Les Lee
c71f2d7425 wifi data usage: Update calling API name
Bug: 213387087
Test: atest -c NetworkTemplateTest
Test: atest -c NetworkStatsServiceTest
Test: atest -c FrameworksWifiApiTests
Test: atest -c NetworkPolicyManagerServiceTest
Change-Id: I6f65af5e2ff121a2fe5b2429d3eead01e434f8be
Merged-In: I6f65af5e2ff121a2fe5b2429d3eead01e434f8be
2022-01-23 00:07:02 +08:00
Sooraj Sasindran
6f36b8431d Merge "Ability to specify which all applications fall under enterprise slice." am: a2e98bdc1a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1905551

Change-Id: I80bfa2eac57e4ba37b1eab18cb7d603b6fc71f19
2022-01-21 16:15:38 +00:00