Chiachang Wang
ab58f0c4c2
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
2022-01-11 09:33:29 +00:00
Chiachang Wang
da13f899e3
Merge "Add test for setting excludeLocalRoutes"
2022-01-11 08:56:38 +00:00
Junyu Lai
b7396ea9bf
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
2022-01-10 12:21:09 +00:00
Matt Buckley
fb982983ce
Merge "Revert^2 "Revert "Add CTS tests for exclude VPN routes APIs""" am: 67197b7ed6 am: e6aed4b035
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1941195
Change-Id: Ib6f4c89516ac4c936a89b640b57d381ce255b2ba
2022-01-07 18:17:35 +00:00
Matt Buckley
67197b7ed6
Merge "Revert^2 "Revert "Add CTS tests for exclude VPN routes APIs"""
2022-01-07 17:48:45 +00:00
Matt Buckley
01d9abecef
Revert^2 "Revert "Add CTS tests for exclude VPN routes APIs""
...
1a6d19e4b8
Change-Id: Ic25e5e4eaf57e033a9304244387e6fba15213d2b
2022-01-07 17:44:52 +00:00
Taras Antoshchuk
60e77a6b52
Merge "Revert "Revert "Add CTS tests for exclude VPN routes APIs""" am: b0818dd720 am: b4177c19ea
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1931760
Change-Id: I3467cb48023c7da6de571920bb52e2bc9cf289ad
2022-01-07 17:05:55 +00:00
Taras Antoshchuk
b0818dd720
Merge "Revert "Revert "Add CTS tests for exclude VPN routes APIs"""
2022-01-07 16:27:12 +00:00
Treehugger Robot
c6cb899865
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
2022-01-07 15:57:30 +00:00
Junyu Lai
c412b621ce
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
2022-01-07 15:57:06 +00:00
Junyu Lai
7cec348cd4
[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
2022-01-07 15:57:04 +00:00
Junyu Lai
50a8f07132
[MS42.2] Adopt TelephonyDisplayInfo in unit test
...
Test: atest NetworkStatsSubscriptionsMonitorTest
Fix: 213021103
Change-Id: Ib6b472a095a6ae92a2574c1ea2d382e1c2699d57
2022-01-07 06:45:56 +00:00
Junyu Lai
0e9c51ca5c
[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
2022-01-07 06:45:56 +00:00
Junyu Lai
eaa58de991
[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
2022-01-07 06:45:56 +00:00
Junyu Lai
3cb8fe8c66
[MS17.3] Remove NetworkStatsManagerInternal dependency
...
Test: atest MultipathPolicyTrackerTest
Bug: 204830222
Change-Id: I219e963124b8fa0967ea08f2f047f7c654ab4a04
2022-01-07 06:45:56 +00:00
Chiachang Wang
b4a319bf24
Add test for setting excludeLocalRoutes
...
Bug: 184750836
Test: atest FrameworksNetTests
Change-Id: I4e79467ce7afcf07f4b8d7f964a605703a6d2c5e
2022-01-07 09:39:43 +08:00
Junyu Lai
5bdd14b848
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
2022-01-06 14:09:50 +00:00
Junyu Lai
1b69ac1a18
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
2022-01-06 14:09:31 +00:00
Junyu Lai
392161e651
Merge "[MS32.2] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage"
2022-01-06 13:57:12 +00:00
Junyu Lai
38e0582797
Merge "[MS34.2] Replace TelephonyManager#getSubscriberId(subId) with public API"
2022-01-06 13:56:39 +00:00
Taras Antoshchuk
1a6d19e4b8
Revert "Revert "Add CTS tests for exclude VPN routes APIs""
...
This reverts commit f4882153ed .
Reason for revert: failing build target configuration is fixed
Change-Id: Ic8ed8fce72a1c816ee6766f296efaddeafcd2f70
2022-01-05 14:00:25 +01:00
Treehugger Robot
55180757fb
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
2022-01-05 11:17:43 +00:00
Treehugger Robot
ee7ca130dc
Merge "[MS33.2] Remove NetdService dependency"
2022-01-05 10:39:13 +00:00
Junyu Lai
a9b4fa7248
[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
2022-01-05 05:31:05 +00:00
Junyu Lai
851fb24667
[MS34.2] Replace TelephonyManager#getSubscriberId(subId) with public API
...
Test: atest com.android.server.net.NetworkStatsSubscriptionsMonitorTest
Bug: 204830222
Change-Id: I53cdf9a83a38ea6921bff02be48bc14a4012ba36
2022-01-05 05:31:05 +00:00
Junyu Lai
37880f857a
[MS33.2] Remove NetdService dependency
...
This change pass INetd to NetworkStatsFactory to replace
NetdService#getNetdInstance.
Test: atest FrameworksNetTests
Bug: 204830222
Change-Id: I0756188adb394fa5343c8d2ae354567df63acf21
2022-01-05 05:30:39 +00:00
lucaslin
6044b11a9c
Caps callback should be called when underlying networks are changed am: 36faae95ba am: 0be0f9dc54
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1838424
Change-Id: I1ebba7deac03a3c3e4f57ceacd44e141b5f4955f
2022-01-05 03:55:13 +00:00
lucaslin
36faae95ba
Caps callback should be called when underlying networks are changed
...
Add a test to check if onCapabilitiesChanged will be called when
the underlying networks are changed.
Bug: 191918368
Test: atest CtsHostsideNetworkTests:HostsideVpnTests
Change-Id: I8dfb16e01199d41b1b65f69e129ec40e37f9ab0f
2022-01-04 15:27:11 +08:00
Treehugger Robot
05ed2b9a6f
Merge "[MS25.2] Remove AppOpsManager.OP_GET_USAGE_STATS dependency" am: 90cf8dbd92 am: 86d23e7da9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934184
Change-Id: I8e256c8b7fc2c83bf6398b3d87a793a49f50c554
2022-01-03 23:17:36 +00:00
Treehugger Robot
90cf8dbd92
Merge "[MS25.2] Remove AppOpsManager.OP_GET_USAGE_STATS dependency"
2022-01-03 22:41:30 +00:00
Les Lee
fe44c47335
Merge "wifi data usage: replaced Wi-Fi SSID with a Wi-Fi network key" am: 719ce67677 am: 28df48c743
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1916599
Change-Id: Id57ddf598a0b5ef3ab5102f2cd4da6f50cac67a4
2022-01-03 12:55:11 +00:00
Les Lee
719ce67677
Merge "wifi data usage: replaced Wi-Fi SSID with a Wi-Fi network key"
2022-01-03 12:36:49 +00:00
Les Lee
c728c36ca7
wifi data usage: replaced Wi-Fi SSID with a Wi-Fi network key
...
1. Used SSID to be a wifi network identity can't separate wifi
data usage when there are two different network with same SSID.
Use a new usage key from in WifiInfo to replace wifi SSID to
solve this issue.
2. To support to query wifi usage per configured Wifi network.
Adding matchWifiNetworkKeys in NetworkTemplate to support querying
multi networkKeys wifi data usage since each configured Wifi
network configuration might be used to connect different Wifi
network.
a. Replaced wording SSID with key of the wifi network
b. Add mock to handle get wifi network key from WifiInfo
c. Add null/empty set unit test to verify matchWifiNetworkKeys
Bug: 197520752
Bug: 126299427
Test: atest -c NetworkTemplateTest
Test: atest -c NetworkStatsServiceTest
Test: atest -c NetworkPolicyManagerServiceTest
Change-Id: Id7d66f6548dd1b4e657db8d7427213293618b406
2022-01-03 15:13:45 +08:00
Treehugger Robot
74aa4827ee
Merge "[MS26.2] Remove Process.NETWORK_STACK_UID dependency" am: 1065477cd7 am: ef1988c368
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934185
Change-Id: Ib28acac5bfac14db5bedbf6fdb0bafc3880d99ac
2021-12-30 13:00:06 +00:00
Treehugger Robot
1065477cd7
Merge "[MS26.2] Remove Process.NETWORK_STACK_UID dependency"
2021-12-30 12:43:39 +00:00
Junyu Lai
9051e66b22
[MS25.2] Remove AppOpsManager.OP_GET_USAGE_STATS dependency
...
Replaced by public interface.
Test: TH
Bug: 204830222
Change-Id: I1071bcaa74429885165d9dc8d1b02a1c1c48c685
2021-12-28 10:00:43 +00:00
Junyu Lai
289db92ba4
[MS26.2] Remove Process.NETWORK_STACK_UID dependency
...
Check NetworkStack permission instead.
Test: NetworkStatsAccessTest
Bug: 20483022
Change-Id: Ie345cfa7dec8e001246efec8a27a1dc67a5c989c
2021-12-28 10:00:43 +00:00
Chiachang Wang
a64b5db0d8
Merge "Add NetworkProviderTest#testRegisterNetworkOffer back into test" am: e4ee88f108 am: d8f3d2c774
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934177
Change-Id: I71817014959d38219f6bb063d3d784b096a5fc43
2021-12-28 09:54:40 +00:00
Chiachang Wang
e4ee88f108
Merge "Add NetworkProviderTest#testRegisterNetworkOffer back into test"
2021-12-28 09:24:16 +00:00
Chiachang Wang
6a0d0c5579
Merge "Allow VPN network agent to exclude local traffic" am: a7b3d00968 am: 3ded8323ea
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927018
Change-Id: I4a7d56abb55dee7c95aaa5584f6273504f0aa16c
2021-12-28 08:09:40 +00:00
Chiachang Wang
a7b3d00968
Merge "Allow VPN network agent to exclude local traffic"
2021-12-28 07:45:20 +00:00
Chiachang Wang
bb754d6cc5
Allow VPN network agent to exclude local traffic
...
Add API to allow network agent to set whether the local traffic
is excluded from the network. This commit is nonfunctional
currently but only storing the boolean inside the NAI.
Bug: 184750836
Test: atest FrameworksNetTests
Change-Id: I3799216ac8fdf22eb4bcabc6c6136d8edbf69360
2021-12-28 11:13:21 +08:00
Treehugger Robot
e4f38d3d54
Merge "Add the fixed test case back into presubmit" am: 3763316aeb am: 89763b0ba3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930827
Change-Id: Ia3044257db56333b8ce2e2819dea41f21329ab0a
2021-12-27 10:26:00 +00:00
Treehugger Robot
3763316aeb
Merge "Add the fixed test case back into presubmit"
2021-12-27 10:02:52 +00:00
Chiachang Wang
69761b4c1c
Add NetworkProviderTest#testRegisterNetworkOffer back into test
...
This test was temporarily disabled because prebuilt module is not
updated in the branch. Now the prebuilt was S already, so add the
test back to test to ensure the coverage.
Test: atest FrameworksNetTests CtsNetTestCases
Bug: 189074532
Change-Id: I510f457d2869c2904404fe7ef55828e84636e4c5
2021-12-27 03:30:47 +00:00
Chiachang Wang
1d110cf84e
Merge "Dump target sdk version for ConnectivityCoverageTests into 31" am: e32642e752 am: 0400333c8a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930831
Change-Id: I87cbe460236fe40df182a5b0de82e05494a6708c
2021-12-27 01:39:15 +00:00
Chiachang Wang
e32642e752
Merge "Dump target sdk version for ConnectivityCoverageTests into 31"
2021-12-27 01:09:04 +00:00
Treehugger Robot
59c87b9ebc
Merge "Add enterpriseSpecifier" am: fbe500351e am: 35dfb16fbb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919260
Change-Id: I14738d24a8b141705e57384c9d826dce9e5a881b
2021-12-23 22:57:44 +00:00
Treehugger Robot
fbe500351e
Merge "Add enterpriseSpecifier"
2021-12-23 22:25:20 +00:00
Sooraj Sasindran
4196937bdd
Add enterpriseSpecifier
...
Add enterpriseSpecifier to network capability
Bug: 194332512
CTS-Coverage-Bug: 211133973
Test: CTS and unit test.
Change-Id: If16c8e17cee71cc6788c43a8818bcca68a00bf99
2021-12-23 09:32:20 -08:00