Merge "Ability to specify which all applications fall under enterprise slice." am: a2e98bdc1a am: f8f7f7d623
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1905551
Change-Id: I52e2397a2cdb3269aa160c0c640293834407e396
Sooraj Sasindran
authored and
Automerger Merge Worker
commited 2022-01-21 16:40:03 +00:00
b172e293df
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
Merge "[MS65.2] Add unit test of NetworkIdentity#Builder" am: 7f3f9c1be0 am: 8908690e61
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1956038
Change-Id: I7088e9c75ccafaad961e15c83a68f843dddf9b9d
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-21 09:58:05 +00:00
1b248f21bf
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
Ability to specify which all applications fall under enterprise slice.
...
Bug: 194332512
Test: unit test
Change-Id: I94549a41aaa717add22b0a3e5035beacf6f1b8f2
Sooraj Sasindran
commited 2022-01-21 01:05:12 -08:00
499117f279
Merge "[DU03-2]Remove INetworkStatsService from BatteryStatsImpl" am: 413a3b1306 am: aa8b1bbda4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1953494
Change-Id: Ic9b08c77015a15f6f3e93c980014b19f63be583b
Frank Li
authored and
Automerger Merge Worker
commited 2022-01-21 08:43:38 +00:00
aeaa964bd9
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 am: 86723eea2a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1940838
Change-Id: I2efee244b37f94ffc058fff0a114b7fd19b9585f
Chiachang Wang
authored and
Automerger Merge Worker
commited 2022-01-21 07:00:22 +00:00
0f894413c0
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 am: 3963627a33
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951101
Change-Id: I99204b40b14bdb76a9a2afa865ba77c9129088a0
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-21 05:25:56 +00:00
db072734e0
Merge "[MS41.2] Add unit test for query history APIs" am: 606fb4f79f am: e06471a60f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1936493
Change-Id: Iadd85718e719b09eb08d030d2dc1bae9c42c9e2c
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-21 01:07:19 +00:00
c916eb9a8a
[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 am: 0225ef74d6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1952103
Change-Id: I1f857065b22776eeeb7f3a6c3315dc466aa6b444
Aaron Huang
authored and
Automerger Merge Worker
commited 2022-01-20 05:37:53 +00:00
195113019e
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 am: ec24ccf3e5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1952115
Change-Id: I7b5c49ec698d965d3a62033d10ffeeff5f6bf22a
Chiachang Wang
authored and
Automerger Merge Worker
commited 2022-01-19 02:42:43 +00:00
e44a5aa59f
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 am: acb12affa2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1944728
Change-Id: I46ef31f6311450e77556522b7e7221b0ab501096
Aaron Huang
authored and
Automerger Merge Worker
commited 2022-01-17 10:07:37 +00:00
017ec3aac3
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 am: 5854b40065
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1905550
Change-Id: I4d0da31854a555f3d8e039bee61fd44e0c13e03e
Sooraj Sasindran
authored and
Automerger Merge Worker
commited 2022-01-13 17:50:43 +00:00
ae47e9143e
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 am: 7cb670e776
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1940842
Change-Id: I94321afaf3acc7f245f34f9f3f3ad926979b5c5b
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-13 11:36:53 +00:00
c6cc62ef3c
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
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
Frank Li
authored and
Automerger Merge Worker
commited 2022-01-13 06:11:17 +00:00
27fb34c2d0
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"
Frank Li
authored and
Gerrit Code Review
commited 2022-01-13 05:45:42 +00:00
231503a08c
Merge "Add excludeLocalRoutes in NativeNetworkConfig" am: e52be3b59f am: 6571c82556
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1944725
Change-Id: I9b9ae0fc67509766c63300966469382bd62a331b
Chiachang Wang
authored and
Automerger Merge Worker
commited 2022-01-13 01:27:09 +00:00
ec42cfc39e
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 am: a460e2e474
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1937330
Change-Id: I3072bab23bae32c1182096cb566529a6a3594778
Chiachang Wang
authored and
Automerger Merge Worker
commited 2022-01-11 09:33:29 +00:00
ab58f0c4c2
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 am: 665da11c53
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1938693
Change-Id: I8540010df5ba0e714d17d6b8b19359489de5a31e
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-10 12:21:09 +00:00
b7396ea9bf
[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 am: fc294135ba
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1936490
Change-Id: I4349dd3fe4ef291df4c0a77a23a8a8dc30f9e06a
Treehugger Robot
authored and
Automerger Merge Worker
commited 2022-01-07 15:57:30 +00:00
c6cb899865
Merge changes from topic "ms17-multipath" am: bc1f44adb0 am: 31028206da
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930833
Change-Id: I9263c1ede3fd0558c269ce0aeb5acd941f971860
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-07 15:57:06 +00:00
c412b621ce
[MS17.2] Fix remaining daily budget assertion am: eaa58de991 am: e09d39d37e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930832
Change-Id: Id8834e89326119fac5bbf10b94d6e62b8e5eb1f8
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-07 15:57:04 +00:00
7cec348cd4
[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.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
[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
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 am: 89d6bdf330
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935967
Change-Id: I3ab051c2745baab3081cbeb91daf5d10aaee168c
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-06 14:09:50 +00:00
5bdd14b848
Merge "[MS34.2] Replace TelephonyManager#getSubscriberId(subId) with public API" am: 38e0582797 am: 13f0d24647
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935970
Change-Id: Ibc05a4867e8ed2722352245e383313dba02448ff
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-01-06 14:09:31 +00:00
1b69ac1a18
Merge "[MS33.2] Remove NetdService dependency" am: ee7ca130dc am: ac65d203f0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935969
Change-Id: Ib124d7c4a4be5274b504946640c4a9ec1c5fbd3f
Treehugger Robot
authored and
Automerger Merge Worker
commited 2022-01-05 11:17:43 +00:00
55180757fb
[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