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
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
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-27 09:35:03 +00:00
11124c2106
Test UidCounterSetMap in NetworkStatsServiceTest
...
Test: atest FrameworksNetTests
Change-Id: I1ae720fcc3192712b3dcbe69619f97f7df1a1f5e
markchien
commited 2022-01-27 17:28:19 +08:00
8f3917501b
Merge "[MS59.2] Add unit test for NetworkStatsDataMigrationUtils"
Junyu Lai
authored and
Gerrit Code Review
commited 2022-01-27 09:20:10 +00:00
bfdd0f3c3c
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
[MS59.2] Add unit test for NetworkStatsDataMigrationUtils
...
Test: atest NetworkStatsDataMigrationUtilsTest
Bug: 204830222
Change-Id: Ia6e8aec9a828072a2a1e63bec600c2e20d3699b3
junyulai
authored and
Junyu Lai
commited 2022-01-26 16:53:06 +00:00
a1bb3a36cd
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
[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
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-26 10:46:37 +00:00
9010433afa
[MS78.2] Fix NetworkIdentity#Builder crashing on 5G NSA networks
...
Test: atest NetworkIdentityTest
Fix: 216193400
Change-Id: I00abc97a98dfdf17d5f0c2e6b45d28be9899c5c3
Junyu Lai
commited 2022-01-26 07:53:57 +00:00
30f06afda3
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
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
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-25 16:59:40 +00:00
a10e284925
Merge "[DU09-1]Adding the NetworkStatsCollection Builder"
Junyu Lai
authored and
Gerrit Code Review
commited 2022-01-25 16:44:16 +00:00
41483efa02
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
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-25 13:51:41 +00:00
b26c3ea08b
Merge "[MS68.2] Adapt NetworkPolicyManagerService to use registerUsageCallback"
Junyu Lai
authored and
Gerrit Code Review
commited 2022-01-25 13:30:57 +00:00
bc8328bda4
[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
Hungming Chen
commited 2022-01-25 20:32:25 +08:00
358d582730
[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
Frank
commited 2022-01-25 19:43:23 +08:00
c8856596c5
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
Mark Chien
authored and
Automerger Merge Worker
commited 2022-01-25 03:47:52 +00:00
2e42a1e5e9
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
Mark Chien
authored and
Automerger Merge Worker
commited 2022-01-25 03:47:34 +00:00
99e5e8102d
Merge "Replace some netd calls in NetworkManagementService"
Mark Chien
authored and
Gerrit Code Review
commited 2022-01-25 03:34:54 +00:00
7586d33f22
Merge "Replace INetd#trafficSwapActiveStatsMap with ConnectivityManager API"
Mark Chien
authored and
Gerrit Code Review
commited 2022-01-25 03:34:14 +00:00
f3cf7c00a6
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
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-25 01:37:22 +00:00
ba4588b638
Merge "[MS67.2] Modify tests for registerUsageCallback"
Junyu Lai
authored and
Gerrit Code Review
commited 2022-01-25 01:23:45 +00:00
3f9584bfda
Merge "Add unit test for BpfInterfaceMapUpdate" am: d512ec646c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1956062
Change-Id: I459e219d0940c85d58577de5dedfc5deab3d143e
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-01-24 19:23:45 +00:00
6c6cf9fecb
Merge "Add unit test for BpfInterfaceMapUpdate"
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2022-01-24 19:05:28 +00:00
d512ec646c
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
Sooraj Sasindran
authored and
Automerger Merge Worker
commited 2022-01-24 16:41:19 +00:00
59d67460af
Merge "Add support for Multiple enterprise slice"
Sooraj Sasindran
authored and
Gerrit Code Review
commited 2022-01-24 16:26:03 +00:00
0311ea0bc6
[MS68.2] Adapt NetworkPolicyManagerService to use registerUsageCallback
...
This change also address comments at aosp/1958145.
Test: atest FrameworksNetTests
Bug: 204830222
Change-Id: I415d74df34caa91b1e1160478ebff30fbd1c7b6f
junyulai
commited 2022-01-24 22:12:42 +08:00
0a007c248c
[MS67.2] Modify tests for registerUsageCallback
...
Test: atest FrameworksNetTests
Bug: 204830222
Change-Id: Ia4ff535cd703807516d65b582727684cbb670360
junyulai
commited 2022-01-24 18:59:23 +08:00
f8a1d3e5e6
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
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-24 05:58:06 +00:00
bc0d70f6b1
[MS56.2] Add unit test for NetworkStatsHistory#Builder
...
Test: atest NetworkStatsHistoryTest#testBuilder
Bug: 204830222
Change-Id: Id876340bcab7290d5e191dbdfcce7fb4d8ecf96c
Junyu Lai
authored and
junyulai
commited 2022-01-23 20:52:31 +08:00
6d95db48d0
[MS65.4] Address comments at aosp/1954383
...
Test: atest NetworkIdentityTest#testBuilder
Bug: 204830222
Change-Id: I3d0f8175ee782c76839cbbdb5eb8a1219a61d874
Junyu Lai
authored and
junyulai
commited 2022-01-23 20:52:31 +08:00
84413a92c3
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
Les Lee
authored and
Automerger Merge Worker
commited 2022-01-23 00:46:53 +00:00
5119944e72
Add support for Multiple enterprise slice
...
Bug: 194332512
Test: unit test
CTS-Coverage-Bug: 211133973
Change-Id: Ie8be08a7cfa9155168d1da146d02fd1643248bdc
Sooraj Sasindran
commited 2022-01-22 14:39:40 -08:00
f4a58dcd45
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
Les Lee
commited 2022-01-23 00:07:02 +08:00
c71f2d7425
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
Sooraj Sasindran
authored and
Automerger Merge Worker
commited 2022-01-21 16:15:38 +00:00
6f36b8431d
Merge "Ability to specify which all applications fall under enterprise slice."
Sooraj Sasindran
authored and
Gerrit Code Review
commited 2022-01-21 16:01:44 +00:00
a2e98bdc1a
Add unit test for BpfInterfaceMapUpdate
...
Bug: 215095957
Test: atest FrameworkNetTests
Change-Id: I92d45e5a606f466ce42504629cb3f87fd9e25d22
markchien
commited 2022-01-21 23:34:25 +08:00
adf119a8ed
Replace some netd calls in NetworkManagementService
...
This is the corresponding test change with netd usage replacement
in NetworkManagementService.
Bug: 209935649
Test: atest NetworkManagementServiceTest
Change-Id: Id25f2d7d291eef7c8bb12a7fcf67b1619cce6da5
markchien
commited 2022-01-21 17:49:29 +08:00
f243be2267
Merge "[MS65.2] Add unit test of NetworkIdentity#Builder" am: 7f3f9c1be0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1956038
Change-Id: I0b80fa72656fe7e6242de3351261a20d0b8ed633
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-21 09:48:51 +00:00
449a950fe0
Merge "[MS65.2] Add unit test of NetworkIdentity#Builder"
Junyu Lai
authored and
Gerrit Code Review
commited 2022-01-21 09:36:08 +00:00
7f3f9c1be0