Message	SHA1
Merge "Replace some netd calls in NetworkManagementService" am: 7586d33f22 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1949805 Change-Id: Id4455e3090e555667d15461fc33fecf5333079bd Mark Chien   authored and   Automerger Merge Worker   commited 2022-01-25 03:47:52 +00:00	2e42a1e5e9
Merge "Replace INetd#trafficSwapActiveStatsMap with ConnectivityManager API" am: f3cf7c00a6 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1949804 Change-Id: I3f0d37493a44cb4f3488b747a039a3c9e60c33ac Mark Chien   authored and   Automerger Merge Worker   commited 2022-01-25 03:47:34 +00:00	99e5e8102d
Merge "Replace some netd calls in NetworkManagementService" Mark Chien   authored and   Gerrit Code Review   commited 2022-01-25 03:34:54 +00:00	7586d33f22
Merge "Replace INetd#trafficSwapActiveStatsMap with ConnectivityManager API" Mark Chien   authored and   Gerrit Code Review   commited 2022-01-25 03:34:14 +00:00	f3cf7c00a6
Merge "[MS67.2] Modify tests for registerUsageCallback" am: 3f9584bfda ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958145 Change-Id: I1986a2bd9096c98378ee4b85a9150d7d0fc27a6f Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-25 01:37:22 +00:00	ba4588b638
Merge "[MS67.2] Modify tests for registerUsageCallback" Junyu Lai   authored and   Gerrit Code Review   commited 2022-01-25 01:23:45 +00:00	3f9584bfda
Merge "Add unit test for BpfInterfaceMapUpdate" am: d512ec646c ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1956062 Change-Id: I459e219d0940c85d58577de5dedfc5deab3d143e Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-01-24 19:23:45 +00:00	6c6cf9fecb
Merge "Add unit test for BpfInterfaceMapUpdate" Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2022-01-24 19:05:28 +00:00	d512ec646c
Merge "Add support for Multiple enterprise slice" am: 0311ea0bc6 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1905552 Change-Id: If5236959716beeb70e91c4831949325e8a53d099 Sooraj Sasindran   authored and   Automerger Merge Worker   commited 2022-01-24 16:41:19 +00:00	59d67460af
Merge "Add support for Multiple enterprise slice" Sooraj Sasindran   authored and   Gerrit Code Review   commited 2022-01-24 16:26:03 +00:00	0311ea0bc6
[MS67.2] Modify tests for registerUsageCallback ... Test: atest FrameworksNetTests Bug: 204830222 Change-Id: Ia4ff535cd703807516d65b582727684cbb670360 junyulai   commited 2022-01-24 18:59:23 +08:00	f8a1d3e5e6
wifi data usage: Update calling API name am: c71f2d7425 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1957863 Change-Id: Ie1767815373e8225ada360288816690f82a7fbe0 Les Lee   authored and   Automerger Merge Worker   commited 2022-01-23 00:46:53 +00:00	5119944e72
Add support for Multiple enterprise slice ... Bug: 194332512 Test: unit test CTS-Coverage-Bug: 211133973 Change-Id: Ie8be08a7cfa9155168d1da146d02fd1643248bdc Sooraj Sasindran   commited 2022-01-22 14:39:40 -08:00	f4a58dcd45
wifi data usage: Update calling API name ... Bug: 213387087 Test: atest -c NetworkTemplateTest Test: atest -c NetworkStatsServiceTest Test: atest -c FrameworksWifiApiTests Test: atest -c NetworkPolicyManagerServiceTest Change-Id: I6f65af5e2ff121a2fe5b2429d3eead01e434f8be Merged-In: I6f65af5e2ff121a2fe5b2429d3eead01e434f8be Les Lee   commited 2022-01-23 00:07:02 +08:00	c71f2d7425
Merge "Ability to specify which all applications fall under enterprise slice." am: a2e98bdc1a ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1905551 Change-Id: I80bfa2eac57e4ba37b1eab18cb7d603b6fc71f19 Sooraj Sasindran   authored and   Automerger Merge Worker   commited 2022-01-21 16:15:38 +00:00	6f36b8431d
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
Add unit test for BpfInterfaceMapUpdate ... Bug: 215095957 Test: atest FrameworkNetTests Change-Id: I92d45e5a606f466ce42504629cb3f87fd9e25d22 markchien   commited 2022-01-21 23:34:25 +08:00	adf119a8ed
Replace some netd calls in NetworkManagementService ... This is the corresponding test change with netd usage replacement in NetworkManagementService. Bug: 209935649 Test: atest NetworkManagementServiceTest Change-Id: Id25f2d7d291eef7c8bb12a7fcf67b1619cce6da5 markchien   commited 2022-01-21 17:49:29 +08:00	f243be2267
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 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1953494 Change-Id: Id49b1406e938f7d920968fd8ae8ec708fbba4a11 Frank Li   authored and   Automerger Merge Worker   commited 2022-01-21 08:30:23 +00:00	0243072c74
Merge "[DU03-2]Remove INetworkStatsService from BatteryStatsImpl" Frank Li   authored and   Gerrit Code Review   commited 2022-01-21 08:15:25 +00:00	413a3b1306
Replace INetd#trafficSwapActiveStatsMap with ConnectivityManager API ... This is the corresponding test change with INetd#trafficSwapActiveStatsMap usage replacement. Bug: 209935649 Test: atest NetworkStatsFactoryTest Change-Id: Ic5e29f6a928c4230322ed658fe8ddbd71d7ea56a markchien   commited 2022-01-21 16:02:26 +08:00	daf30ef9a8
Merge "Update the SDK for the tests with intended target in T+" am: b04664d7a6 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1940838 Change-Id: I1328fee57a62d41956393b08291ba344fe210589 Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-01-21 06:48:37 +00:00	536ce6ce09
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 "[MS41.2] Add unit test for query history APIs" am: 606fb4f79f ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1936493 Change-Id: I25a408b7d7798e42dff7752329a819f3a22fd9ce Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-21 00:49:27 +00:00	4588b2a599
[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
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
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 Sooraj Sasindran   authored and   Automerger Merge Worker   commited 2022-01-13 17:39:19 +00:00	be39390b94
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" am: 231503a08c ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1925678 Change-Id: I4914227dd13995004560146d7d71b1fdc7cf61ea Frank Li   authored and   Automerger Merge Worker   commited 2022-01-13 05:57:40 +00:00	c62b4a5153
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 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1944725 Change-Id: I4d803a07a0c3f4861d20606016a39b765b50fa96 Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-01-13 01:15:35 +00:00	c5c9013ed0
Merge "Add excludeLocalRoutes in NativeNetworkConfig" Chiachang Wang   authored and   Gerrit Code Review   commited 2022-01-13 00:57:49 +00:00	e52be3b59f
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 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1938693 Change-Id: I368c59f1d6d3d092dc724ef117dd2a6750d28d6b Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-10 12:06:20 +00:00	a555356b80
[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 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1936490 Change-Id: Iea8ed8617301577ef868b9f1b618f9e1bf02d78f Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-01-07 14:47:55 +00:00	98bc03a5cf
Merge changes from topic "ms17-multipath" am: bc1f44adb0 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930833 Change-Id: I6979d343608cafa1e1c7d9d82b07cb857f441e5a Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-07 14:39:52 +00:00	12697efb58
[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.3] Remove NetworkStatsManagerInternal dependency ... Test: atest MultipathPolicyTrackerTest Bug: 204830222 Change-Id: I219e963124b8fa0967ea08f2f047f7c654ab4a04 Junyu Lai   commited 2022-01-07 06:45:56 +00:00	3cb8fe8c66
[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
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 Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-06 14:18:15 +00:00	f618bd3596
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 Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-06 14:17:58 +00:00	8710730e5d
Merge "[MS33.2] Remove NetdService dependency" am: ee7ca130dc ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935969 Change-Id: I0691571417540e52f31b26dbdcfc5a5c47d5270e Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-01-05 11:00:58 +00:00	3ab05bf005
[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 "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 Les Lee   authored and   Automerger Merge Worker   commited 2022-01-03 12:46:11 +00:00	03c6f6d116