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
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
Frank Li
authored and
Automerger Merge Worker
commited 2022-01-21 08:30:23 +00:00
0243072c74
Merge "[DU03-2]Remove INetworkStatsService from BatteryStatsImpl"
Frank Li
authored and
Gerrit Code Review
commited 2022-01-21 08:15:25 +00:00
413a3b1306
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
Chiachang Wang
authored and
Automerger Merge Worker
commited 2022-01-21 06:48:37 +00:00
536ce6ce09
Merge "Update the SDK for the tests with intended target in T+"
Chiachang Wang
authored and
Gerrit Code Review
commited 2022-01-21 06:34:29 +00:00
b04664d7a6
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
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-21 04:43:24 +00:00
9eab5596a7
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
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-21 00:49:27 +00:00
4588b2a599
[MS65.2] Add unit test of NetworkIdentity#Builder
...
Test: atest NetworkIdentityTest#testBuilder
Bug: 204830222
Change-Id: Ie0d56821608c881c3bffe224cfe240fa900c6f39
Junyu Lai
commited 2022-01-20 15:58:30 +00:00
e9c4988632
[MS57.2] Prepare APIs for data migration utility
...
Test: atest NetworkStatsHistoryTest#testBuilder
Bug: 204830222
Change-Id: I938c3ed50eea0f2349ea92c3824c637eaa77d328
Junyu Lai
commited 2022-01-20 15:06:50 +00:00
56f4a9c3d1
[MS41.2] Add unit test for query history APIs
...
Test: atest NetworkStatsServiceTest NetworkStatsManagerTest
Bug: 204830222
Bug: 200768422
Change-Id: I1dce7d671c5524496e0451665f62447ef6e454ae
Junyu Lai
commited 2022-01-20 15:06:50 +00:00
7372824eca
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
Aaron Huang
authored and
Automerger Merge Worker
commited 2022-01-20 04:20:59 +00:00
fe66f8f95c
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
Chiachang Wang
commited 2022-01-20 10:30:19 +08:00
7212fbee14
[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
Frank
commited 2022-01-20 00:15:55 +08:00
9ef027c2f5
Add unit test for NetworkStats iterator
...
Bug: 210073043
Test: this
Change-Id: I2bcd80627c31e94ac040dbb4e7d38561d8f4c229
Aaron Huang
commited 2022-01-19 17:10:44 +08:00
2ae5921bc8
Add missing DevSdkIgnoreRule rule variable am: af7c44cc4e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1952115
Change-Id: Ibbebbf3d259e59554cde226f4bbc7aa8442909cb
Chiachang Wang
authored and
Automerger Merge Worker
commited 2022-01-19 02:25:48 +00:00
b364284c22
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
Chiachang Wang
commited 2022-01-18 11:25:03 +00:00
af7c44cc4e
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
Aaron Huang
authored and
Automerger Merge Worker
commited 2022-01-17 09:47:43 +00:00
778e9d325f
Merge "Use getter methods to verify the fields of Entry"
Aaron Huang
authored and
Gerrit Code Review
commited 2022-01-17 09:31:55 +00:00
63b5da9866
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
Sooraj Sasindran
authored and
Automerger Merge Worker
commited 2022-01-13 17:39:19 +00:00
be39390b94
Merge "Ability for DPM to specify fallback mechanism"
Sooraj Sasindran
authored and
Gerrit Code Review
commited 2022-01-13 17:24:07 +00:00
226131ab48
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
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-13 11:36:08 +00:00
cf545ce5a1
Merge "[MS44.2] Add unit test for API to query tagged UID summary"
Junyu Lai
authored and
Gerrit Code Review
commited 2022-01-13 11:25:15 +00:00
5db1ea12b5
Ability for DPM to specify fallback mechanism
...
Bug: 194332512
Test: unit test
Change-Id: Id4d85da8f64e7559326c4657b8833dac3ce5ce3d
Sooraj Sasindran
commited 2022-01-13 06:07:36 +00:00
06baf4cfa1
Merge "[DU01]Remove INetworkManagementService from NetworkStatsService" am: 231503a08c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1925678
Change-Id: I4914227dd13995004560146d7d71b1fdc7cf61ea
Frank Li
authored and
Automerger Merge Worker
commited 2022-01-13 05:57:40 +00:00
c62b4a5153
Merge "[DU01]Remove INetworkManagementService from NetworkStatsService"
Frank Li
authored and
Gerrit Code Review
commited 2022-01-13 05:45:42 +00:00
231503a08c
Merge "Add excludeLocalRoutes in NativeNetworkConfig" am: e52be3b59f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1944725
Change-Id: I4d803a07a0c3f4861d20606016a39b765b50fa96
Chiachang Wang
authored and
Automerger Merge Worker
commited 2022-01-13 01:15:35 +00:00
c5c9013ed0
Merge "Add excludeLocalRoutes in NativeNetworkConfig"
Chiachang Wang
authored and
Gerrit Code Review
commited 2022-01-13 00:57:49 +00:00
e52be3b59f
[MS44.2] Add unit test for API to query tagged UID summary
...
Test: atest NetworkStatsManagerTest
Bug: 204830222
Change-Id: I0b712141b7c644205bba3a98ebf39803f0d05306
Junyu Lai
commited 2022-01-12 14:07:02 +00:00
7ef0a17544
Use getter methods to verify the fields of Entry
...
Bug: 210073043
Bug: 204830222
Test: FrameworksNetTests
Change-Id: I1ade9113e9367a85b7c200c8f52d8ff3ffc14770
Aaron Huang
commited 2022-01-11 18:16:27 +08:00
c448b73a22
Merge "Add test for setting excludeLocalRoutes" am: da13f899e3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1937330
Change-Id: I81d1d64f4cee3f964d33b291ac7d214f20287f89
Chiachang Wang
authored and
Automerger Merge Worker
commited 2022-01-11 09:13:17 +00:00
adf5b3df28
Merge "Add test for setting excludeLocalRoutes"
Chiachang Wang
authored and
Gerrit Code Review
commited 2022-01-11 08:56:38 +00:00
da13f899e3
Add excludeLocalRoutes in NativeNetworkConfig
...
Add extra field in NativeNetworkConfig to allow CS to notify
netd whether the local traffic should be excluded from the VPN
network.
Bug: 184750836
Test: atest FrameworksNetworkTests
Change-Id: If230fe7057722c80a09433673ac3cec857f7a7a5
Chiachang Wang
commited 2022-01-11 11:33:44 +08:00
bf6b879b55
Merge "[MS42.2] Adopt TelephonyDisplayInfo in unit test" am: 6a360b5a71
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1938693
Change-Id: I368c59f1d6d3d092dc724ef117dd2a6750d28d6b
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-10 12:06:20 +00:00
a555356b80
[DU01]Remove INetworkManagementService from NetworkStatsService
...
NetworkStatsService is using INetworkManagementService APIs, which
cannot be accessed after moving into the mainline module. So, replace
and remove those hidden API usages.
Bug: 209738761
Test: atest NetworkStatsServiceTest
Change-Id: Ieda3c3382fa61411587c5b390bbecb2a2524844b
lifr
commited 2022-01-08 01:33:36 +08:00
214714285a
Merge "[MS39.2] Remove the looper from NetworkStatsSubscriptionMonitor" am: 7d9470ca0b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1936490
Change-Id: Iea8ed8617301577ef868b9f1b618f9e1bf02d78f
Treehugger Robot
authored and
Automerger Merge Worker
commited 2022-01-07 14:47:55 +00:00
98bc03a5cf
Merge changes from topic "ms17-multipath" am: bc1f44adb0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930833
Change-Id: I6979d343608cafa1e1c7d9d82b07cb857f441e5a
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-07 14:39:52 +00:00
12697efb58
[MS42.2] Adopt TelephonyDisplayInfo in unit test
...
Test: atest NetworkStatsSubscriptionsMonitorTest
Fix: 213021103
Change-Id: Ib6b472a095a6ae92a2574c1ea2d382e1c2699d57
Junyu Lai
commited 2022-01-07 06:45:56 +00:00
50a8f07132
[MS39.2] Remove the looper from NetworkStatsSubscriptionMonitor
...
OnSubscriptionsChangedListenerHandler(Looper looper) is
hidden, there is no way to pass a looper to it in the test.
This change partially revert aosp/1340040 to fix hidden
API dependency. And will use a different approach to address
this problem in later stages.
Test: atest NetworkStatsSubscriptionMonitorTest
Bug: 204830222
Bug: 213280079
Change-Id: Ie17f04cd9f174f2895bde4607bbd7a9a92181a96
Junyu Lai
commited 2022-01-07 06:45:56 +00:00
0e9c51ca5c
[MS17.3] Remove NetworkStatsManagerInternal dependency
...
Test: atest MultipathPolicyTrackerTest
Bug: 204830222
Change-Id: I219e963124b8fa0967ea08f2f047f7c654ab4a04
Junyu Lai
commited 2022-01-07 06:45:56 +00:00
3cb8fe8c66
[MS17.2] Fix remaining daily budget assertion
...
Currently, the test didn't mock data usage of the month.
Thus, when asserting remaining budget, the calculation
always assumes there is no used data, hence wrong budget
value is expected. See #getRemainingDailyBudget.
This change makes data usage of this month includes the
bytes used today. And adjust the policy limit accordingly.
Test: atest MultipathPolicyTrackerTest
Bug: 204830222
Change-Id: I3ca6505f8d502047485ba3676f16fbc474117cc1
Junyu Lai
commited 2022-01-07 06:45:56 +00:00
eaa58de991
Add test for setting excludeLocalRoutes
...
Bug: 184750836
Test: atest FrameworksNetTests
Change-Id: I4e79467ce7afcf07f4b8d7f964a605703a6d2c5e
Chiachang Wang
commited 2022-01-07 09:39:43 +08:00
b4a319bf24
Merge "[MS32.2] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage" am: 392161e651
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935967
Change-Id: I69826a3d41fbfb0e2cbb97027fa5be8f30254ebb
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-06 14:18:15 +00:00
f618bd3596
Merge "[MS34.2] Replace TelephonyManager#getSubscriberId(subId) with public API" am: 38e0582797
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935970
Change-Id: Ia9d57163c3cac702480ab1b03ce6dba8cb3d189e
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-06 14:17:58 +00:00
8710730e5d
Merge "[MS33.2] Remove NetdService dependency" am: ee7ca130dc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935969
Change-Id: I0691571417540e52f31b26dbdcfc5a5c47d5270e
Treehugger Robot
authored and
Automerger Merge Worker
commited 2022-01-05 11:00:58 +00:00
3ab05bf005
[MS32.2] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage
...
Replace intent receiver with callback listener.
Test: atest com.android.server.net.NetworkStatsServiceTest
Bug: 204830222
Change-Id: I07ef87b08b5d177719a82f79a2866d72b003fb5a
Junyu Lai
commited 2022-01-05 05:31:05 +00:00
a9b4fa7248
[MS34.2] Replace TelephonyManager#getSubscriberId(subId) with public API
...
Test: atest com.android.server.net.NetworkStatsSubscriptionsMonitorTest
Bug: 204830222
Change-Id: I53cdf9a83a38ea6921bff02be48bc14a4012ba36
Junyu Lai
commited 2022-01-05 05:31:05 +00:00
851fb24667
[MS33.2] Remove NetdService dependency
...
This change pass INetd to NetworkStatsFactory to replace
NetdService#getNetdInstance.
Test: atest FrameworksNetTests
Bug: 204830222
Change-Id: I0756188adb394fa5343c8d2ae354567df63acf21
Junyu Lai
commited 2022-01-05 05:30:39 +00:00
37880f857a
Merge "[MS25.2] Remove AppOpsManager.OP_GET_USAGE_STATS dependency" am: 90cf8dbd92
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934184
Change-Id: Id38304832941e5ee9b528824db9ac2102365d380
Treehugger Robot
authored and
Automerger Merge Worker
commited 2022-01-03 22:59:55 +00:00
91cebac87d
Merge "[MS25.2] Remove AppOpsManager.OP_GET_USAGE_STATS dependency"
Treehugger Robot
authored and
Gerrit Code Review
commited 2022-01-03 22:41:30 +00:00
90cf8dbd92