LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,304 Commits 2 Branches 0 Tags
fe66f8f95c06becab6dd722f2393e72ed3ba223a
Commit Graph

448 Commits

Author SHA1 Message Date
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
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
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
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
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
Chiachang Wang
c5c9013ed0 Merge "Add excludeLocalRoutes in NativeNetworkConfig" am: e52be3b59f 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1944725

Change-Id: I4d803a07a0c3f4861d20606016a39b765b50fa96
 2022-01-13 01:15:35 +00:00
Chiachang Wang
e52be3b59f Merge "Add excludeLocalRoutes in NativeNetworkConfig" 2022-01-13 00:57:49 +00:00
Junyu Lai
7ef0a17544 [MS44.2] Add unit test for API to query tagged UID summary 
Test: atest NetworkStatsManagerTest
Bug: 204830222
Change-Id: I0b712141b7c644205bba3a98ebf39803f0d05306
 2022-01-12 14:07:02 +00:00
Aaron Huang
c448b73a22 Use getter methods to verify the fields of Entry 
Bug: 210073043
Bug: 204830222
Test: FrameworksNetTests
Change-Id: I1ade9113e9367a85b7c200c8f52d8ff3ffc14770
 2022-01-11 18:16:27 +08:00
Chiachang Wang
adf5b3df28 Merge "Add test for setting excludeLocalRoutes" am: da13f899e3 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1937330

Change-Id: I81d1d64f4cee3f964d33b291ac7d214f20287f89
 2022-01-11 09:13:17 +00:00
Chiachang Wang
da13f899e3 Merge "Add test for setting excludeLocalRoutes" 2022-01-11 08:56:38 +00:00
Chiachang Wang
bf6b879b55 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
 2022-01-11 11:33:44 +08:00
Junyu Lai
a555356b80 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
 2022-01-10 12:06:20 +00:00
lifr
214714285a [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
 2022-01-08 01:33:36 +08:00
Treehugger Robot
98bc03a5cf 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
 2022-01-07 14:47:55 +00:00
Junyu Lai
12697efb58 Merge changes from topic "ms17-multipath" am: bc1f44adb0 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930833

Change-Id: I6979d343608cafa1e1c7d9d82b07cb857f441e5a
 2022-01-07 14:39:52 +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
3cb8fe8c66 [MS17.3] Remove NetworkStatsManagerInternal dependency 
Test: atest MultipathPolicyTrackerTest
Bug: 204830222

Change-Id: I219e963124b8fa0967ea08f2f047f7c654ab4a04
 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
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
f618bd3596 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
 2022-01-06 14:18:15 +00:00
Junyu Lai
8710730e5d 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
 2022-01-06 14:17:58 +00:00
Treehugger Robot
3ab05bf005 Merge "[MS33.2] Remove NetdService dependency" am: ee7ca130dc 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935969

Change-Id: I0691571417540e52f31b26dbdcfc5a5c47d5270e
 2022-01-05 11:00:58 +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
Treehugger Robot
91cebac87d 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
 2022-01-03 22:59:55 +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
03c6f6d116 Merge "wifi data usage: replaced Wi-Fi SSID with a Wi-Fi network key" am: 719ce67677 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1916599

Change-Id: I75d8b4b78d54a6238e4c4195a8cb03133b163888
 2022-01-03 12:46: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
9084e85884 Merge "[MS26.2] Remove Process.NETWORK_STACK_UID dependency" am: 1065477cd7 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934185

Change-Id: I277c3e4400bebfbb1c92946a482430f093f0e0e9
 2021-12-30 12:46:11 +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
1a2ea82e9a Merge "Allow VPN network agent to exclude local traffic" am: a7b3d00968 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927018

Change-Id: Ic399862188be78c5886a7f89f9e29be4c41da528
 2021-12-28 07:57:09 +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
lucaslin
a36535a2c8 Add test for Vpn#prepare() 
Add test for Vpn#prepare() to check if the SecurityException will
be thrown when the caller is not the SYSTEM_UID and doesn't have
CONTROL_VPN permission and its package doesn't match the oldPackage
or the newPackage.

Ignore-AOSP-First: It's a part of security patches.
Bug: 191276656
Test: atest FrameworksNetTests:VpnTest
Change-Id: Ibe0b245561b00442a6377fb849603f8b9026e9c4
Merged-In: Ibe0b245561b00442a6377fb849603f8b9026e9c4
 2021-12-23 06:54:45 +00:00
Junyu Lai
78d36d7653 Merge "[MS15.2] Move SUBSCRIBER_ID_MATCH_RULE_* constants to static lib" 2021-12-23 01:35:00 +00:00
Frank Li
bacbe802c1 Merge "[DU02]Remove DevicePolicyManagerInternal from NetworkStatsAccess" 2021-12-22 14:13:55 +00:00