Message	SHA1
Merge changes from topic "preparation_fork_clatd_from_system_server" am: 43f9729e90 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934178 Change-Id: I5f26eaaf16faf055a63cdd1b2bb4a973c20317c0 Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-01-26 00:40:49 +00:00	3723e300fc
Merge changes from topic "preparation_fork_clatd_from_system_server" ... * changes: [CLATJ#24] ClatCoordinatorTest: add basic unit tests [CLATJ#23] Close the file descriptor manually [CLATJ#22] ClatCoordinator: stop clatd [CLATJ#21] ClatCoordinator: start clatd Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2022-01-26 00:26:48 +00:00	43f9729e90
Merge "[DU09-1]Adding the NetworkStatsCollection Builder" am: 41483efa02 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1957862 Change-Id: I4c3a0aa8b9581f2e7851d19e2971ab9bda0b71ef Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-25 16:59:40 +00:00	a10e284925
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 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958899 Change-Id: I32b46c02a38f8427589887f44a009d4c654a5c01 Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-25 13:51:41 +00:00	b26c3ea08b
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
[CLATJ#24] ClatCoordinatorTest: add basic unit tests ... Introduce ClatCoordinatorTest for unit tests of class ClatCoordinator. Add the tests: - testStartStopClatd - testGetFwmark - testAdjustMtu Bug: 212345928 Test: atest FrameworksNetTests Change-Id: I6908eac05b14077b450d51e1432d340c8a247eb1 Hungming Chen   commited 2022-01-25 20:32:25 +08:00	358d582730
[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 ... 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
[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 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951102 Change-Id: I6ef265c5f23be31ce0a191edea9998abaa9c6182 Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-24 05:58:06 +00:00	bc0d70f6b1
[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 ... 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
Merge "[MS65.2] Add unit test of NetworkIdentity#Builder" am: 7f3f9c1be0 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1956038 Change-Id: I0b80fa72656fe7e6242de3351261a20d0b8ed633 Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-21 09:48:51 +00:00	449a950fe0
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 ... 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 "[MS57.2] Prepare APIs for data migration utility" am: 015e5690af ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951101 Change-Id: I56a9b92f33fc1fb36deeab9cf387122a87eabebe Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-21 04:43:24 +00:00	9eab5596a7
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
[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 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1952103 Change-Id: Ic8da78fdfe5a6c3acae50b809c6adcf36f4994e2 Aaron Huang   authored and   Automerger Merge Worker   commited 2022-01-20 04:20:59 +00:00	fe66f8f95c
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 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1952115 Change-Id: Ibbebbf3d259e59554cde226f4bbc7aa8442909cb Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-01-19 02:25:48 +00:00	b364284c22
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 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1944728 Change-Id: I38d6fd3633fb5bbd4a39760e54203af731637b56 Aaron Huang   authored and   Automerger Merge Worker   commited 2022-01-17 09:47:43 +00:00	778e9d325f