Message	SHA1
[MS68.4] Address comments at aosp/1958144 ... Test: atest TrafficStatsTest NetworkUsageStatsTest FrameworksNetTests Bug: 204830222 Ignore-AOSP-First: merge conflict Change-Id: I2578e13e2844591adac1d1902f2454ec7079ceea Frank   commited 2022-02-08 16:23:51 +08:00	21d9760250
Merge "Use RECEIVER_NOT_EXPORTED in CarrierPrivilegeAuthenticator." am: d262e71965 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1970499 Change-Id: I5fadd544619ea315a16eed9cfa6b6e5a70e01cd6 Jean Chalard   authored and   Automerger Merge Worker   commited 2022-02-04 16:53:37 +00:00	f3f151f798
Merge "Use RECEIVER_NOT_EXPORTED in CarrierPrivilegeAuthenticator." Jean Chalard   authored and   Gerrit Code Review   commited 2022-02-04 16:40:30 +00:00	d262e71965
Merge "Add APIs for discover/resolve on specific networks" am: d61719c422 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1944726 Change-Id: I5d6e69d78a54be962134d62262ec0938280ea8d0 Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-02-04 12:18:44 +00:00	5baa9f74ca
Merge "Add APIs for discover/resolve on specific networks" Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2022-02-04 12:07:38 +00:00	d61719c422
Use RECEIVER_NOT_EXPORTED in CarrierPrivilegeAuthenticator. ... Passing one of RECEIVER_EXPORTED or RECEIVER_NOT_EXPORTED is required for all code targeting T or above. The correct value here is RECEIVER_NOT_EXPORTED because the receiver is being registered in the system server and the broadcast comes from the system server itself (same UID). This does not need to be guarded by OS version because CarrierPrivilegeAuthenticator is only used on T+. Test: m Fix: 217642082 Change-Id: I09840b17bd54352896607737b56c6a692ffbd2c2 Lorenzo Colitti   authored and   Chalard Jean   commited 2022-02-04 15:31:06 +09:00	7569d51446
Add APIs for discover/resolve on specific networks ... Test that NsdManager specifies the correct network when a service is discovered, and that services can be resolved on a specified network. Also test that service discovery can be started on a specific network. Bug: 190249673 Test: atest NsdManagerTest Change-Id: Ie8b551ce9e33e3adf35f75508f91bbd0df71f837 Remi NGUYEN VAN   commited 2022-02-03 16:05:02 +09:00	06bdcec9fa
Merge changes Ic6a1aa92,I685f924a,I50fab91e am: 2bc73d3b18 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1936492 Change-Id: Id1883f7c7209ad1e8ab5bd097467886d897116a2 Jean Chalard   authored and   Automerger Merge Worker   commited 2022-02-02 07:54:21 +00:00	15d3140a33
Accept accessUids from telephony when it's the carrier config app ... Test: FrameworksNetTests, new test in this patch Change-Id: I50fab91e107c51d33a5e529c73b83db198a88d2c Chalard Jean   commited 2022-02-02 13:52:25 +09:00	ac9ace0bbe
Merge "Clean up BpfNetMaps" am: d36de12652 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1962620 Change-Id: I3351f56844a9b48ff4f77d2e7cc723102e255745 Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-02-01 13:08:33 +00:00	33a41b8d64
Clean up BpfNetMaps ... Cleans up BpfNetMaps.java before enabling mainline code path. Bug: 202086915 Test: atest FrameworksNetTests Change-Id: I28e5d63ed4624df540b1ca47b71899cff7321ded Ken Chen   authored and   Patrick Rohr   commited 2022-02-01 12:31:03 +01:00	f5f51339af
Merge changes Ifd6be50a,I857e40c9,I1b9f4fde,Ib3b43cf2 am: 76709a18e9 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1966602 Change-Id: I172654f1eb824ce8a241ef3551d31b1385fa5365 Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-02-01 03:17:27 +00:00	f0a36ba740
Merge changes Ifd6be50a,I857e40c9,I1b9f4fde,Ib3b43cf2 ... * changes: Prevent native_init from starting TrafficController Remove libutils dependency from libservice-connectivity Merge libtraffic_controller_jni into libservice-connectivity [NETD-TC#15] Make ConnectivityService and PermissionMonitor calls BpfNetMaps on T Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2022-02-01 03:02:36 +00:00	76709a18e9
Merge changes Id5e5b911,I8301abad,I7262811a,I658e579b,I7d43ef0e am: 4fcb8ad292 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958935 Change-Id: I923bebc0438371fdc0a5d95d2a7a1485079a0b5a Jean Chalard   authored and   Automerger Merge Worker   commited 2022-02-01 01:01:58 +00:00	5f780da415
Merge changes Id5e5b911,I8301abad,I7262811a,I658e579b,I7d43ef0e ... * changes: Expose access UIDs. Send access UIDs to netd Add accessUids to NetworkCapabilities. Clean up restrictions on network agent capabilities Sanitize NetworkCapabilities from agent on the handler thread Jean Chalard   authored and   Gerrit Code Review   commited 2022-02-01 00:45:55 +00:00	4fcb8ad292
Merge "Fix kernelToTag import in NetworkStatsFactoryTest." am: d508855bb9 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1965521 Change-Id: I7dc3f917b38283eac67b7f9d2185355850857d52 Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-01-31 14:04:01 +00:00	f99ca92278
Merge "Fix kernelToTag import in NetworkStatsFactoryTest." Lorenzo Colitti   authored and   Gerrit Code Review   commited 2022-01-31 13:35:30 +00:00	d508855bb9
[NETD-TC#15] Make ConnectivityService and PermissionMonitor ... calls BpfNetMaps on T Since TrafficController moves to mainline module for T, so some netd binder interfaces revelant to BPF are going to deprecated. Provide JNI APIs to call TrafficController inside mainline module for T. Bug: 209935649 Test: atest CtsHostsideNetworkTests Change-Id: Ib3b43cf2840e02806395af9f1e019ca6fccd032e Wayne Ma   authored and   Patrick Rohr   commited 2022-01-31 09:19:08 +01:00	2fde98c87b
Send access UIDs to netd ... Test: FrameworkNetTests CtsNetTestCases Change-Id: I8301abaddf5850071fa23d41e8e736ab7071e299 Chalard Jean   commited 2022-01-31 17:04:58 +09:00	e6c9527554
Add accessUids to NetworkCapabilities. ... For now, all entry points reject this. Followup changes will allow the supported use cases. Test: new unit tests and CTS for this in this patch Change-Id: I7262811a2e46336d3bb63c80886fc0578a36da94 Chalard Jean   commited 2022-01-31 17:04:58 +09:00	9a30acf744
Allow Carrier app to request for CBS capability am: e9cd2084e4 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1950396 Change-Id: I5b58c6c9e7eb6c1f43417923abd7ad32eb5f1c96 Sooraj Sasindran   authored and   Automerger Merge Worker   commited 2022-01-31 00:59:07 +00:00	42ba1af05c
Allow Carrier app to request for CBS capability ... Test: unit test and CTS Bug: 194332512 Change-Id: I29680b56d790106ad082f1a398c2bddb030f834a Sooraj Sasindran   commited 2022-01-30 12:12:17 -08:00	e9cd2084e4
Fix kernelToTag import in NetworkStatsFactoryTest. ... NetworkManagementSocketTagger#kernelToTag is moving to NetworkStatsFactory. Fix the import path in the test. Test: atest FrameworksNetTest Change-Id: I8797d9e589e68b4980ff5b38ba09d091420d30fd Lorenzo Colitti   commited 2022-01-29 21:35:06 +09:00	f59770f769
Merge "Adjust NetworkStatsServiceTest to mock out the JNI." am: c5ad7cd775 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1964822 Change-Id: I60785b009973468ea2564b3474d1e39c32e12e3d Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-01-28 12:07:44 +00:00	38733baa0e
Adjust NetworkStatsServiceTest to mock out the JNI. ... Test: atest NetworkStatsServiceTest Change-Id: Icdea9f871199f1e859aef647e5ba3dec7ac02d73 Lorenzo Colitti   commited 2022-01-28 18:16:39 +09:00	9fdbb7ec7d
Merge "Test UidCounterSetMap in NetworkStatsServiceTest" am: dd26c5709e ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961303 Change-Id: I3542978192829d265cc582c8c2d20c3cb60f4c86 Mark Chien   authored and   Automerger Merge Worker   commited 2022-01-27 10:46:56 +00:00	8123e528e7
Merge "Test UidCounterSetMap in NetworkStatsServiceTest" Mark Chien   authored and   Gerrit Code Review   commited 2022-01-27 10:02:35 +00:00	dd26c5709e
Test UidCounterSetMap in NetworkStatsServiceTest ... Test: atest FrameworksNetTests Change-Id: I1ae720fcc3192712b3dcbe69619f97f7df1a1f5e markchien   commited 2022-01-27 17:28:19 +08:00	8f3917501b
Merge "Change NETWORK_TYPE_5G_NSA reference package" am: 85a2ef3dd5 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961305 Change-Id: I5c61e698271f010416dc2b061e14c62fe86255b8 Aaron Huang   authored and   Automerger Merge Worker   commited 2022-01-27 08:58:08 +00:00	27fba62481
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 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961299 Change-Id: Ifd238b453ad75085217b70afdbe35f8766644218 Nucca Chen   authored and   Automerger Merge Worker   commited 2022-01-26 15:04:34 +00:00	739bf2569f
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 ... 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 "[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
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