LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,163 Commits 2 Branches 0 Tags
dedc8ea091429f194bba0ccb7c262191d0052c97
Commit Graph

586 Commits

Author SHA1 Message Date
Junyu Lai
83e3f4608b Merge "[MS42.2] Adopt TelephonyDisplayInfo in unit test" am: 6a360b5a71 am: 665da11c53 am: b7396ea9bf 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1938693

Change-Id: Ia39970b80eb359ab3c157b3b5a782736c3afcc1d
 2022-01-10 12:34:20 +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
Treehugger Robot
e25f2b35c7 Merge "[MS39.2] Remove the looper from NetworkStatsSubscriptionMonitor" am: 7d9470ca0b am: fc294135ba am: c6cb899865 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1936490

Change-Id: I167314dacdf0102aae00d67d229fc4459d1bc56a
 2022-01-07 16:18:52 +00:00
Junyu Lai
07da334957 Merge changes from topic "ms17-multipath" am: bc1f44adb0 am: 31028206da am: c412b621ce 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930833

Change-Id: I361364428b7d5065d7242ad9ad52555b8f479bb4
 2022-01-07 16:18:34 +00:00
Junyu Lai
3dae2f74bb [MS17.2] Fix remaining daily budget assertion am: eaa58de991 am: e09d39d37e am: 7cec348cd4 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930832

Change-Id: Ia31faefa7f8655849419e2b9ad26412469210d45
 2022-01-07 16:18:30 +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
Junyu Lai
51b14b066f Merge "[MS32.2] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage" am: 392161e651 am: 89d6bdf330 am: 5bdd14b848 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935967

Change-Id: Ib3d96cd7d86f44fd0431ca8803c4891b16e91a55
 2022-01-06 14:24:10 +00:00
Junyu Lai
c29114ba64 Merge "[MS34.2] Replace TelephonyManager#getSubscriberId(subId) with public API" am: 38e0582797 am: 13f0d24647 am: 1b69ac1a18 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935970

Change-Id: I48c9ab49883577cee3d17c7310d7d31a4b3109c7
 2022-01-06 14:23:37 +00: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
Treehugger Robot
79e835cda3 Merge "[MS33.2] Remove NetdService dependency" am: ee7ca130dc am: ac65d203f0 am: 55180757fb 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935969

Change-Id: I0ecaefff87cd61475f11052fd6b0c0f336c27f6e
 2022-01-05 19:12:19 +00: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
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
ad1615551e Merge "[MS25.2] Remove AppOpsManager.OP_GET_USAGE_STATS dependency" am: 90cf8dbd92 am: 86d23e7da9 am: 05ed2b9a6f 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934184

Change-Id: I94ad676c862ff9527f56ca98d5343bd3d70b5a56
 2022-01-03 23:35:49 +00: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
15e48292e1 Merge "wifi data usage: replaced Wi-Fi SSID with a Wi-Fi network key" am: 719ce67677 am: 28df48c743 am: fe44c47335 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1916599

Change-Id: I54acc2f35e855f0061c26481dd3403fd70b8fbaa
 2022-01-03 13:03:22 +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
0325aa9792 Merge "[MS26.2] Remove Process.NETWORK_STACK_UID dependency" am: 1065477cd7 am: ef1988c368 am: 74aa4827ee 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934185

Change-Id: I63fbb6bb871cd3c039611f222e9490303bb40473
 2021-12-30 13:06:05 +00: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
3220389541 Merge "Allow VPN network agent to exclude local traffic" am: a7b3d00968 am: 3ded8323ea am: 6a0d0c5579 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927018

Change-Id: I958918559aaf4447e45f7dcde65d2b50caabcb1a
 2021-12-28 08:22:57 +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
Lucas Lin
7db5f91856 [conflict] Merge "Add test for Vpn#prepare()" into sc-dev am: f89a629776 am: 66737a8c5d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15606164
 2021-12-23 13:13:29 +00:00
Lucas Lin
66737a8c5d Merge "Add test for Vpn#prepare()" into sc-dev am: f89a629776 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15606164

Change-Id: I6b9024a183cefba4ce7173650d78c61ee60c9ec2
 2021-12-23 12:32:09 +00:00
lucaslin
c01630e963 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:53:18 +00:00
Junyu Lai
2e158b9229 Merge "[MS15.2] Move SUBSCRIBER_ID_MATCH_RULE_* constants to static lib" am: 78d36d7653 am: 6e952001f8 am: e30e727a57 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930824

Change-Id: I6c64d586daffeb1fd226dabd238ea8b2cfca5b4d
 2021-12-23 02:17:03 +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
32bde18ab2 Merge "[DU02]Remove DevicePolicyManagerInternal from NetworkStatsAccess" am: bacbe802c1 am: 6f9dbdb13a am: 0f96c5d627 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1925684

Change-Id: Ib7fa09e37b46cc7d3fdd5b2c37cc7afd95ff68cc
 2021-12-22 15:05:17 +00:00
Frank Li
bacbe802c1 Merge "[DU02]Remove DevicePolicyManagerInternal from NetworkStatsAccess" 2021-12-22 14:13:55 +00:00
Junyu Lai
07c772cf49 [MS15.2] Move SUBSCRIBER_ID_MATCH_RULE_* constants to static lib 
Subscriber Id Match Rules won't be exposed as system Api.
Any caller who references NetworkTemplate#SUBSCRIBER_ID_MATCH_RULE_*
should use the one in NetworkStatsUtils instead.
And remove the need of the constants as soon as possible.

Test: atest NetworkPolicyManagerServiceTest \
      FrameworksNetTests
Bug: 204830222
Change-Id: I363a4440f85f1ca818eaf1125e45b141dd6f0e55
 2021-12-22 09:41:29 +00:00
Jack Yu
aef2883f44 Added a new network capability MMTEL am: 04bbc5b9b0 am: c98051396a am: 69f3375c30 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930920

Change-Id: I5b95957f95dc05fca7c5f77de9ad16a5d3f86f23
 2021-12-22 09:39:13 +00:00
lucaslin
f76481568d 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-22 07:03:31 +00:00
Jack Yu
04bbc5b9b0 Added a new network capability MMTEL 
Added NET_CAPABILITY_MMTEL to indicate a network
support MMTEL (Multimedia telephony). This is for
IMS service to request an IMS network that supports
voice or PS (VoPS for 4G, VoNR for 5G).

This was previously submitted as aosp/1927841, but
which got reverted due to breaking the mainline
build, which uses the pre-built module.

Bug: 210774375
Test: atest ConnectivityServiceTest
Change-Id: If8b691ff4999a4dbf54e7567d9ca74d743dc5ded
 2021-12-21 16:31:30 +00:00
lifr
5f66ddac71 [DU02]Remove DevicePolicyManagerInternal from NetworkStatsAccess 
NetworkStatsAccess is using DevicePolicyManagerInternal APIs, which
cannot be accessed after moving into the mainline module. So, replace
and remove those hidden API usages.

Bug: 207100745
Test: atest NetworkStatsAccessTest
Change-Id: I0430ed2c47e5a695206cb660e3971ddab6c467dd
 2021-12-21 23:45:28 +08:00
Treehugger Robot
8df99de1be Merge "[MS12.2] Add unit test for NetworkTemplate builder" am: 05e12e6f79 am: f5c2f797da am: 9aa4bedc7b 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1928058

Change-Id: I2a52227b981ef2da7387b5184bbd882776264a46
 2021-12-21 15:40:12 +00:00