Message	SHA1
Merge "Change NETWORK_TYPE_5G_NSA reference package" am: 85a2ef3dd5 am: 7cac3f3286 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961305 Change-Id: I6f6fd8fbdf1d95db20f3c28226947304726dc8b9 Aaron Huang   authored and   Automerger Merge Worker   commited 2022-01-27 08:59:03 +00:00	60942b60eb
Merge "Change NETWORK_TYPE_5G_NSA reference package" Aaron Huang   authored and   Gerrit Code Review   commited 2022-01-27 08:36:23 +00:00	85a2ef3dd5
Change NETWORK_TYPE_5G_NSA reference package ... NETWORK_TYPE_5G_NSA is moved to NetworkStatsManager Bug: 210073043 Test: builds, FrameworksNetTests Change-Id: I9226119ee4f67688a1b4ffdab7e5a86ec0b8e974 Aaron Huang   commited 2022-01-26 23:41:17 +08:00	b4ce0fa9b1
Merge changes Ie826477d,I5125a3ac am: f8ed984e9c am: c08c9c8d96 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961299 Change-Id: I6bddf77824763929d694e153e8fa4cccde5d34ea Nucca Chen   authored and   Automerger Merge Worker   commited 2022-01-26 15:22:50 +00:00	dc86ef31c6
Merge changes Ie826477d,I5125a3ac ... * changes: [CLATJ#26] ClatCoordinator: reword clatd starting failure logging [CLATJ#25] ClatCoordinator: stop clatd process gracefully Nucca Chen   authored and   Gerrit Code Review   commited 2022-01-26 14:50:11 +00:00	f8ed984e9c
[CLATJ#26] ClatCoordinator: reword clatd starting failure logging ... Bug: 212345928 Test: build Change-Id: Ie826477d27db26cc49d113ec8bfacaaa3006e26e Hungming Chen   authored and   Nucca Chen   commited 2022-01-26 12:23:45 +00:00	6fb21144b8
Merge changes from topic "preparation_fork_clatd_from_system_server" am: 43f9729e90 am: 74fe555a17 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934178 Change-Id: I3d52eaa2a8306e2251ea0e416c77fd6b55fdcaf2 Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-01-26 00:51:32 +00:00	bb4afc3167
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 "[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
[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
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
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
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 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 "[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
[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 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 "[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
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