Message	SHA1
Merge "[DU09-1]Adding the NetworkStatsCollection Builder" am: 41483efa02 am: 4ebfa5be46 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1957862 Change-Id: I3c9eaf13a174979037455270863384dd6ecc084e Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-25 17:13:09 +00:00	31d73d262c
Merge "[DU09-1]Adding the NetworkStatsCollection Builder" Junyu Lai   authored and   Gerrit Code Review   commited 2022-01-25 16:44:16 +00:00	41483efa02
Merge "[MS68.2] Adapt NetworkPolicyManagerService to use registerUsageCallback" am: bc8328bda4 am: 28ddad840d ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958899 Change-Id: I580341450056d53867e7584a3dceb0b70c8e3cb6 Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-25 14:10:09 +00:00	27b14257ec
Merge "[MS68.2] Adapt NetworkPolicyManagerService to use registerUsageCallback" Junyu Lai   authored and   Gerrit Code Review   commited 2022-01-25 13:30:57 +00:00	bc8328bda4
[DU09-1]Adding the NetworkStatsCollection Builder ... The purpose is provide NetworkStatsCollection.Builder as public API for adding the stats {@link NetworkStatsHistory} Bug: 215862801 Test: atest NetworkStatsCollectionTest Change-Id: Id83c6fa67880ba361b8e0e15c4d86b90e44ac879 Frank   commited 2022-01-25 19:43:23 +08:00	c8856596c5
Merge "Replace some netd calls in NetworkManagementService" am: 7586d33f22 am: 9eacb4584a ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1949805 Change-Id: I157639c1504c44ce2070b7d4a1ce2086742e3039 Mark Chien   authored and   Automerger Merge Worker   commited 2022-01-25 04:06:41 +00:00	c7a9d7115b
Merge "Replace INetd#trafficSwapActiveStatsMap with ConnectivityManager API" am: f3cf7c00a6 am: 7962445ee4 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1949804 Change-Id: Iaa8e716574f77da61e2d0f9fa7cb42fcbb5fbf07 Mark Chien   authored and   Automerger Merge Worker   commited 2022-01-25 04:06:14 +00:00	3dcb0bdb5a
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 am: fec250f525 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958145 Change-Id: Ibcc2a34126f201751c3c5e1485708e02eaa37822 Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-25 01:52:23 +00:00	5367f0aa57
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 am: a2d92ecd83 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1956062 Change-Id: I99e314ecffd8d14ee43d22595b6511317abe295e Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-01-24 19:28:40 +00:00	4c5e078f7d
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 am: 36598b6e18 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1905552 Change-Id: I4fe6621b1ffb9dfb75ba7d744b627229ebd0259a Sooraj Sasindran   authored and   Automerger Merge Worker   commited 2022-01-24 16:59:01 +00:00	18f5317a60
Merge "Add support for Multiple enterprise slice" Sooraj Sasindran   authored and   Gerrit Code Review   commited 2022-01-24 16:26:03 +00:00	0311ea0bc6
[MS68.2] Adapt NetworkPolicyManagerService to use registerUsageCallback ... This change also address comments at aosp/1958145. Test: atest FrameworksNetTests Bug: 204830222 Change-Id: I415d74df34caa91b1e1160478ebff30fbd1c7b6f junyulai   commited 2022-01-24 22:12:42 +08:00	0a007c248c
[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
Merge changes from topics "ms56-historybuilder", "ms65.3" am: 4794105511 am: 5877663151 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951102 Change-Id: I7a41d8dd0bcba3a6b37ef8d6e02660ffbac3130f Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-24 06:12:12 +00:00	cdfb046f61
[MS65.4] Address comments at aosp/1954383 am: 84413a92c3 am: 0f533e1949 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1956073 Change-Id: Ia9a6126b8a294cee83c91c7f61000ab3aeaa826e Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-24 06:12:11 +00:00	9794cc7d8b
[MS56.2] Add unit test for NetworkStatsHistory#Builder ... Test: atest NetworkStatsHistoryTest#testBuilder Bug: 204830222 Change-Id: Id876340bcab7290d5e191dbdfcce7fb4d8ecf96c Junyu Lai   authored and   junyulai   commited 2022-01-23 20:52:31 +08:00	6d95db48d0
[MS65.4] Address comments at aosp/1954383 ... Test: atest NetworkIdentityTest#testBuilder Bug: 204830222 Change-Id: I3d0f8175ee782c76839cbbdb5eb8a1219a61d874 Junyu Lai   authored and   junyulai   commited 2022-01-23 20:52:31 +08:00	84413a92c3
wifi data usage: Update calling API name am: c71f2d7425 am: 6b90540d28 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1957863 Change-Id: I8f69f3f4152a4ce796477b2cdba87c8a4b600f55 Les Lee   authored and   Automerger Merge Worker   commited 2022-01-23 01:03:21 +00:00	2daaebce7b
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 am: f8f7f7d623 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1905551 Change-Id: I52e2397a2cdb3269aa160c0c640293834407e396 Sooraj Sasindran   authored and   Automerger Merge Worker   commited 2022-01-21 16:40:03 +00:00	b172e293df
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
Merge "[MS65.2] Add unit test of NetworkIdentity#Builder" am: 7f3f9c1be0 am: 8908690e61 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1956038 Change-Id: I7088e9c75ccafaad961e15c83a68f843dddf9b9d Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-21 09:58:05 +00:00	1b248f21bf
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
Merge "[MS65.2] Add unit test of NetworkIdentity#Builder" Junyu Lai   authored and   Gerrit Code Review   commited 2022-01-21 09:36:08 +00:00	7f3f9c1be0
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 am: aa8b1bbda4 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1953494 Change-Id: Ic9b08c77015a15f6f3e93c980014b19f63be583b Frank Li   authored and   Automerger Merge Worker   commited 2022-01-21 08:43:38 +00:00	aeaa964bd9
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 am: 86723eea2a ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1940838 Change-Id: I2efee244b37f94ffc058fff0a114b7fd19b9585f Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-01-21 07:00:22 +00:00	0f894413c0
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 "[MS57.2] Prepare APIs for data migration utility" am: 015e5690af am: 3963627a33 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951101 Change-Id: I99204b40b14bdb76a9a2afa865ba77c9129088a0 Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-21 05:25:56 +00:00	db072734e0
Merge "[MS41.2] Add unit test for query history APIs" am: 606fb4f79f am: e06471a60f ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1936493 Change-Id: Iadd85718e719b09eb08d030d2dc1bae9c42c9e2c Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-21 01:07:19 +00:00	c916eb9a8a
[MS65.2] Add unit test of NetworkIdentity#Builder ... Test: atest NetworkIdentityTest#testBuilder Bug: 204830222 Change-Id: Ie0d56821608c881c3bffe224cfe240fa900c6f39 Junyu Lai   commited 2022-01-20 15:58:30 +00:00	e9c4988632
[MS57.2] Prepare APIs for data migration utility ... Test: atest NetworkStatsHistoryTest#testBuilder Bug: 204830222 Change-Id: I938c3ed50eea0f2349ea92c3824c637eaa77d328 Junyu Lai   commited 2022-01-20 15:06:50 +00:00	56f4a9c3d1
[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
Merge "Add unit test for NetworkStats iterator" am: ccdf2a5838 am: 0225ef74d6 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1952103 Change-Id: I1f857065b22776eeeb7f3a6c3315dc466aa6b444 Aaron Huang   authored and   Automerger Merge Worker   commited 2022-01-20 05:37:53 +00:00	195113019e
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
Add unit test for NetworkStats iterator ... Bug: 210073043 Test: this Change-Id: I2bcd80627c31e94ac040dbb4e7d38561d8f4c229 Aaron Huang   commited 2022-01-19 17:10:44 +08:00	2ae5921bc8
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