Message	SHA1
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
[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 am: 86d23e7da9 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934184 Change-Id: I8e256c8b7fc2c83bf6398b3d87a793a49f50c554 Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-01-03 23:17:36 +00:00	05ed2b9a6f
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
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 Les Lee   authored and   Automerger Merge Worker   commited 2022-01-03 12:55:11 +00:00	fe44c47335
Merge "wifi data usage: replaced Wi-Fi SSID with a Wi-Fi network key" Les Lee   authored and   Gerrit Code Review   commited 2022-01-03 12:36:49 +00:00	719ce67677
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 Les Lee   commited 2022-01-03 15:13:45 +08:00	c728c36ca7
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 Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-12-30 13:00:06 +00:00	74aa4827ee
Merge "[MS26.2] Remove Process.NETWORK_STACK_UID dependency" Treehugger Robot   authored and   Gerrit Code Review   commited 2021-12-30 12:43:39 +00:00	1065477cd7
[MS25.2] Remove AppOpsManager.OP_GET_USAGE_STATS dependency ... Replaced by public interface. Test: TH Bug: 204830222 Change-Id: I1071bcaa74429885165d9dc8d1b02a1c1c48c685 Junyu Lai   commited 2021-12-28 10:00:43 +00:00	9051e66b22
[MS26.2] Remove Process.NETWORK_STACK_UID dependency ... Check NetworkStack permission instead. Test: NetworkStatsAccessTest Bug: 20483022 Change-Id: Ie345cfa7dec8e001246efec8a27a1dc67a5c989c Junyu Lai   commited 2021-12-28 10:00:43 +00:00	289db92ba4
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 Chiachang Wang   authored and   Automerger Merge Worker   commited 2021-12-28 08:09:40 +00:00	6a0d0c5579
Merge "Allow VPN network agent to exclude local traffic" Chiachang Wang   authored and   Gerrit Code Review   commited 2021-12-28 07:45:20 +00:00	a7b3d00968
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 Chiachang Wang   commited 2021-12-28 11:13:21 +08:00	bb754d6cc5
[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 Lucas Lin   commited 2021-12-23 13:13:29 +00:00	7db5f91856
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 Lucas Lin   authored and   Automerger Merge Worker   commited 2021-12-23 12:32:09 +00:00	66737a8c5d
Merge "[MS15.2] Move SUBSCRIBER_ID_MATCH_RULE_* constants to static lib" Junyu Lai   authored and   Gerrit Code Review   commited 2021-12-23 01:35:00 +00:00	78d36d7653
Merge "[DU02]Remove DevicePolicyManagerInternal from NetworkStatsAccess" Frank Li   authored and   Gerrit Code Review   commited 2021-12-22 14:13:55 +00:00	bacbe802c1