Commit Graph

1854 Commits

Author SHA1 Message Date
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
Sooraj Sasindran
a2e98bdc1a Merge "Ability to specify which all applications fall under enterprise slice." 2022-01-21 16:01:44 +00:00
markchien
adf119a8ed Add unit test for BpfInterfaceMapUpdate
Bug: 215095957
Test: atest FrameworkNetTests

Change-Id: I92d45e5a606f466ce42504629cb3f87fd9e25d22
2022-01-21 23:34:25 +08:00
markchien
f243be2267 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
2022-01-21 17:49:29 +08:00
Junyu Lai
449a950fe0 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
2022-01-21 09:48:51 +00:00
Junyu Lai
7f3f9c1be0 Merge "[MS65.2] Add unit test of NetworkIdentity#Builder" 2022-01-21 09:36:08 +00:00
Sooraj Sasindran
499117f279 Ability to specify which all applications fall under enterprise slice.
Bug: 194332512
Test: unit test
Change-Id: I94549a41aaa717add22b0a3e5035beacf6f1b8f2
2022-01-21 01:05:12 -08:00
Frank Li
0243072c74 Merge "[DU03-2]Remove INetworkStatsService from BatteryStatsImpl" am: 413a3b1306
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1953494

Change-Id: Id49b1406e938f7d920968fd8ae8ec708fbba4a11
2022-01-21 08:30:23 +00:00
Frank Li
413a3b1306 Merge "[DU03-2]Remove INetworkStatsService from BatteryStatsImpl" 2022-01-21 08:15:25 +00:00
markchien
daf30ef9a8 Replace INetd#trafficSwapActiveStatsMap with ConnectivityManager API
This is the corresponding test change with INetd#trafficSwapActiveStatsMap
usage replacement.

Bug: 209935649
Test: atest NetworkStatsFactoryTest
Change-Id: Ic5e29f6a928c4230322ed658fe8ddbd71d7ea56a
2022-01-21 16:02:26 +08:00
Chiachang Wang
536ce6ce09 Merge "Update the SDK for the tests with intended target in T+" am: b04664d7a6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1940838

Change-Id: I1328fee57a62d41956393b08291ba344fe210589
2022-01-21 06:48:37 +00:00
Chiachang Wang
b04664d7a6 Merge "Update the SDK for the tests with intended target in T+" 2022-01-21 06:34:29 +00:00
Junyu Lai
9eab5596a7 Merge "[MS57.2] Prepare APIs for data migration utility" am: 015e5690af
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951101

Change-Id: I56a9b92f33fc1fb36deeab9cf387122a87eabebe
2022-01-21 04:43:24 +00:00
Junyu Lai
4588b2a599 Merge "[MS41.2] Add unit test for query history APIs" am: 606fb4f79f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1936493

Change-Id: I25a408b7d7798e42dff7752329a819f3a22fd9ce
2022-01-21 00:49:27 +00:00
Junyu Lai
e9c4988632 [MS65.2] Add unit test of NetworkIdentity#Builder
Test: atest NetworkIdentityTest#testBuilder
Bug: 204830222
Change-Id: Ie0d56821608c881c3bffe224cfe240fa900c6f39
2022-01-20 15:58:30 +00:00
Junyu Lai
56f4a9c3d1 [MS57.2] Prepare APIs for data migration utility
Test: atest NetworkStatsHistoryTest#testBuilder
Bug: 204830222
Change-Id: I938c3ed50eea0f2349ea92c3824c637eaa77d328
2022-01-20 15:06:50 +00:00
Junyu Lai
7372824eca [MS41.2] Add unit test for query history APIs
Test: atest NetworkStatsServiceTest NetworkStatsManagerTest
Bug: 204830222
Bug: 200768422
Change-Id: I1dce7d671c5524496e0451665f62447ef6e454ae
2022-01-20 15:06:50 +00:00
Aaron Huang
fe66f8f95c Merge "Add unit test for NetworkStats iterator" am: ccdf2a5838
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1952103

Change-Id: Ic8da78fdfe5a6c3acae50b809c6adcf36f4994e2
2022-01-20 04:20:59 +00:00
Chiachang Wang
7212fbee14 Update the SDK for the tests with intended target in T+
Correct the SDK for those tests are expected running in T+
device. Check @IgnoreUpTo(S) may be incorrect after receiving
patches before T release.

Refer to temporary constant definition in DevSdkIgnoreRule until
the SDK constant being pushed into AOSP and synced with branch
used for mainline.

BUg: 215294242
Test: atest CtsNetTestCases CtsNetTestCasesLatestSdk
Change-Id: Ide6a241f7944dd1e75bc33b21aa29471a5df94c6
2022-01-20 10:30:19 +08:00
Frank
9ef027c2f5 [DU03-2]Remove INetworkStatsService from BatteryStatsImpl
Correct the NetworkStatsServiceTest

BatteryStatsImpl is using INetworkStatsService APIs, which
cannot be accessed after moving into the mainline module. So, replace
and remove those hidden API usages.

Bug: 210066922
Test: atest BatteryStatsImplTest WifiPowerCalculatorTest
            MobileRadioPowerCalculatorTest NetworkStatsServiceTest
CTS-Coverage-Bug: 213437796
Change-Id: I47dc377a5cce7d8a0029dc808ad0f46e651764b1
2022-01-20 00:15:55 +08:00
Aaron Huang
2ae5921bc8 Add unit test for NetworkStats iterator
Bug: 210073043
Test: this
Change-Id: I2bcd80627c31e94ac040dbb4e7d38561d8f4c229
2022-01-19 17:10:44 +08:00
Chiachang Wang
b364284c22 Add missing DevSdkIgnoreRule rule variable am: af7c44cc4e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1952115

Change-Id: Ibbebbf3d259e59554cde226f4bbc7aa8442909cb
2022-01-19 02:25:48 +00:00
Chiachang Wang
af7c44cc4e Add missing DevSdkIgnoreRule rule variable
DevSdkIgnoreRule.IgnoreUpTo() will not work as expected without
the rule defined.

Bug: 184750836
Test: atest android.net.Ikev2VpnProfileTest#\
      testBuildExcludeLocalRoutesSet works as expected with ignore
      rule
Change-Id: I03a5b28963cd6feebe4358d57c070d941cd114e5
2022-01-18 11:25:03 +00:00
Aaron Huang
778e9d325f Merge "Use getter methods to verify the fields of Entry" am: 63b5da9866
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1944728

Change-Id: I38d6fd3633fb5bbd4a39760e54203af731637b56
2022-01-17 09:47:43 +00:00
Aaron Huang
63b5da9866 Merge "Use getter methods to verify the fields of Entry" 2022-01-17 09:31:55 +00:00
Sooraj Sasindran
ae47e9143e Merge "Ability for DPM to specify fallback mechanism" am: 226131ab48 am: 5854b40065
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1905550

Change-Id: I4d0da31854a555f3d8e039bee61fd44e0c13e03e
2022-01-13 17:50:43 +00:00
Sooraj Sasindran
be39390b94 Merge "Ability for DPM to specify fallback mechanism" am: 226131ab48
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1905550

Change-Id: I35053ba001db299ef6f4db4ea22ea75370c63ee1
2022-01-13 17:39:19 +00:00
Sooraj Sasindran
226131ab48 Merge "Ability for DPM to specify fallback mechanism" 2022-01-13 17:24:07 +00:00
Junyu Lai
c6cc62ef3c Merge "[MS44.2] Add unit test for API to query tagged UID summary" am: 5db1ea12b5 am: 7cb670e776
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1940842

Change-Id: I94321afaf3acc7f245f34f9f3f3ad926979b5c5b
2022-01-13 11:36:53 +00:00
Junyu Lai
cf545ce5a1 Merge "[MS44.2] Add unit test for API to query tagged UID summary" am: 5db1ea12b5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1940842

Change-Id: Id6f6e656257bfd8181b083c6fa9f4e370d9ea4a3
2022-01-13 11:36:08 +00:00
Junyu Lai
5db1ea12b5 Merge "[MS44.2] Add unit test for API to query tagged UID summary" 2022-01-13 11:25:15 +00:00
Frank Li
27fb34c2d0 Merge "[DU01]Remove INetworkManagementService from NetworkStatsService" am: 231503a08c am: 9f903bfa01
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1925678

Change-Id: Ib6057fcdcfd2013637486de95d092c8ea77e2f66
2022-01-13 06:11:17 +00:00
Sooraj Sasindran
06baf4cfa1 Ability for DPM to specify fallback mechanism
Bug: 194332512
Test: unit test
Change-Id: Id4d85da8f64e7559326c4657b8833dac3ce5ce3d
2022-01-13 06:07:36 +00:00
Frank Li
c62b4a5153 Merge "[DU01]Remove INetworkManagementService from NetworkStatsService" am: 231503a08c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1925678

Change-Id: I4914227dd13995004560146d7d71b1fdc7cf61ea
2022-01-13 05:57:40 +00:00
Frank Li
231503a08c Merge "[DU01]Remove INetworkManagementService from NetworkStatsService" 2022-01-13 05:45:42 +00:00