Treehugger Robot
b6178a4fe5
Merge "Genericize NC#hasSameUids" am: a0d5980011 am: 0c479d5f82 am: c063140c7a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919250
Change-Id: If2185ff886891d57c22ed2f6325f6188cb3dd7d9
2021-12-16 16:31:17 +00:00
Treehugger Robot
c063140c7a
Merge "Genericize NC#hasSameUids" am: a0d5980011 am: 0c479d5f82
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919250
Change-Id: I023a30bb9f593f150b73423daea4d4d1379b10fa
2021-12-16 16:13:01 +00:00
Treehugger Robot
0c479d5f82
Merge "Genericize NC#hasSameUids" am: a0d5980011
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919250
Change-Id: I22725a20c80bde87716ff5a9d44d76fcd4b95f2b
2021-12-16 15:54:01 +00:00
Ayush Sharma
28f657852b
Merge changes from topic "revert-1551943-vpn-impl-FKOLCXTDDT" am: e89170bcb1 am: 23756bef7d am: 626bac0e8c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927304
Change-Id: I6d85fbc0dc9d9cf9bddebb756d28531fb35e2921
2021-12-16 15:52:44 +00:00
Ayush Sharma
3b9f2fcc8c
Revert "Unhide IpPrefix(InetAddress, int)" am: 758ead6dd3 am: ea0caefdd2 am: 6c75679f1d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927303
Change-Id: I2c5800b1850917dcf573e0456b80734b847689c2
2021-12-16 15:52:42 +00:00
Ayush Sharma
a5b1376b1a
Revert "Add CTS tests for exclude VPN routes APIs" am: f4882153ed am: bf8d513fda am: 2623bb352e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927302
Change-Id: I81f1ae63aa32ead0eb5d0b3b65fd21e4ad07ab28
2021-12-16 15:52:37 +00:00
Ayush Sharma
626bac0e8c
Merge changes from topic "revert-1551943-vpn-impl-FKOLCXTDDT" am: e89170bcb1 am: 23756bef7d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927304
Change-Id: I195f88ec1b5ced5ffe6bcef7361f58bd309741ea
2021-12-16 15:39:55 +00:00
Ayush Sharma
6c75679f1d
Revert "Unhide IpPrefix(InetAddress, int)" am: 758ead6dd3 am: ea0caefdd2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927303
Change-Id: Ia636eedc977421aae3ba673ad5f2a38db1f1a75d
2021-12-16 15:39:53 +00:00
Ayush Sharma
2623bb352e
Revert "Add CTS tests for exclude VPN routes APIs" am: f4882153ed am: bf8d513fda
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927302
Change-Id: I97acfec334f9a6deffaf4a8ca914ed2953af6739
2021-12-16 15:39:49 +00:00
Treehugger Robot
a0d5980011
Merge "Genericize NC#hasSameUids"
2021-12-16 15:37:06 +00:00
Ayush Sharma
23756bef7d
Merge changes from topic "revert-1551943-vpn-impl-FKOLCXTDDT" am: e89170bcb1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927304
Change-Id: I309fa33ec3ab757d06c02b374bcd7631969c934c
2021-12-16 15:16:55 +00:00
Ayush Sharma
ea0caefdd2
Revert "Unhide IpPrefix(InetAddress, int)" am: 758ead6dd3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927303
Change-Id: If3840f48333e48895701b12f201e34166e3a3136
2021-12-16 15:16:53 +00:00
Ayush Sharma
bf8d513fda
Revert "Add CTS tests for exclude VPN routes APIs" am: f4882153ed
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927302
Change-Id: Id9904952c064d9bd25aa21121a3ed46af9ad7983
2021-12-16 15:16:50 +00:00
Ayush Sharma
e89170bcb1
Merge changes from topic "revert-1551943-vpn-impl-FKOLCXTDDT"
...
* changes:
Revert "Unhide RouteInfo#getType and related fields"
Revert "Unhide IpPrefix(InetAddress, int)"
Revert "Add CTS tests for exclude VPN routes APIs"
2021-12-16 15:01:30 +00:00
Ayush Sharma
758ead6dd3
Revert "Unhide IpPrefix(InetAddress, int)"
...
Revert "Add APIs that allow to exclude routes from VPN"
Revert "Suppress NewApi warnings for @SystemApi -> public APIs"
Revert "Add VpnServiceBuilderShim for VpnService.Builder"
Revert submission 1551943-vpn-impl
Reason for revert: <DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=mainline_modules_x86_64-userdebug&lkgb=8007224&lkbb=8008168&fkbb=8007902 >, bug b/210979001
Reverted Changes:
I0e7aa077a:Add VpnServiceBuilderShim for VpnService.Builder
Ib12f5ab39:Suppress NewApi warnings for @SystemApi -> public ...
I59b9185cf:Unhide RouteInfo#getType and related fields
Ie5b62b2b2:Unhide IpPrefix(InetAddress, int)
I993a32d40:Add CTS tests for exclude VPN routes APIs
Ib24b2d3fb:Suppress NewApi warnings for @SystemApi -> public ...
Ic3b10464a:Add APIs that allow to exclude routes from VPN
Change-Id: Id0c373fb042a98c1c68807acf7fcfe456520ebe2
BUG: 210979001
2021-12-16 14:40:13 +00:00
Ayush Sharma
f4882153ed
Revert "Add CTS tests for exclude VPN routes APIs"
...
Revert "Add APIs that allow to exclude routes from VPN"
Revert "Suppress NewApi warnings for @SystemApi -> public APIs"
Revert "Add VpnServiceBuilderShim for VpnService.Builder"
Revert submission 1551943-vpn-impl
Reason for revert: <DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=mainline_modules_x86_64-userdebug&lkgb=8007224&lkbb=8008168&fkbb=8007902 >, bug b/210979001
Reverted Changes:
I0e7aa077a:Add VpnServiceBuilderShim for VpnService.Builder
Ib12f5ab39:Suppress NewApi warnings for @SystemApi -> public ...
I59b9185cf:Unhide RouteInfo#getType and related fields
Ie5b62b2b2:Unhide IpPrefix(InetAddress, int)
I993a32d40:Add CTS tests for exclude VPN routes APIs
Ib24b2d3fb:Suppress NewApi warnings for @SystemApi -> public ...
Ic3b10464a:Add APIs that allow to exclude routes from VPN
Change-Id: Ic4f86f405c395f1356de1a6f8cf9e92692d953ce
BUG: 210979001
2021-12-16 14:40:13 +00:00
Ayush Sharma
6d1ea2bb16
Revert "Unhide RouteInfo#getType and related fields"
...
Revert "Add APIs that allow to exclude routes from VPN"
Revert "Suppress NewApi warnings for @SystemApi -> public APIs"
Revert "Add VpnServiceBuilderShim for VpnService.Builder"
Revert submission 1551943-vpn-impl
Reason for revert: <DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=mainline_modules_x86_64-userdebug&lkgb=8007224&lkbb=8008168&fkbb=8007902 >, bug b/210979001
Reverted Changes:
I0e7aa077a:Add VpnServiceBuilderShim for VpnService.Builder
Ib12f5ab39:Suppress NewApi warnings for @SystemApi -> public ...
I59b9185cf:Unhide RouteInfo#getType and related fields
Ie5b62b2b2:Unhide IpPrefix(InetAddress, int)
I993a32d40:Add CTS tests for exclude VPN routes APIs
Ib24b2d3fb:Suppress NewApi warnings for @SystemApi -> public ...
Ic3b10464a:Add APIs that allow to exclude routes from VPN
Change-Id: I98d3b998e4702f56e9d5e17944238b283b29f2b2
BUG: 210979001
2021-12-16 14:40:13 +00:00
Chalard Jean
f4802fa4c2
Genericize NC#hasSameUids
...
This will be used by another set of UIDs in a future patch
Test: FrameworksNetTests
Change-Id: I2c5d18ef93e73b702723814592ef3f3baf5dfbc4
2021-12-16 23:03:42 +09:00
Aaron Huang
767e59c01b
Merge "Add makeDependencies method in IpSecService related tests" am: 3c1e7398a4 am: c6b730ce81 am: 1bf71ba427
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1904464
Change-Id: I8598dd981e5efab1153e0b2068db45e8e2ee5510
2021-12-16 13:22:00 +00:00
Aaron Huang
1bf71ba427
Merge "Add makeDependencies method in IpSecService related tests" am: 3c1e7398a4 am: c6b730ce81
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1904464
Change-Id: I8475912fc900e347217ad2e26b175dadbf10cf02
2021-12-16 13:02:19 +00:00
Aaron Huang
c6b730ce81
Merge "Add makeDependencies method in IpSecService related tests" am: 3c1e7398a4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1904464
Change-Id: Iea5f6c9706b858b337f5bd4f8a6854f6030fc9a1
2021-12-16 12:48:00 +00:00
Aaron Huang
3c1e7398a4
Merge "Add makeDependencies method in IpSecService related tests"
2021-12-16 12:32:41 +00:00
Taras Antoshchuk
89bb3ff718
Merge changes from topic "vpn-impl" am: 8be6ba36dc am: e0895f355a am: a44507ec2b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1551943
Change-Id: I42b02315fdcc62704d8f92f3bc7bf462dc5b9edf
2021-12-16 12:04:31 +00:00
Taras Antoshchuk
3c54cc1c9f
Unhide IpPrefix(InetAddress, int) am: a5a1b80222 am: 6cf24035ca am: 21e769376b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1831813
Change-Id: Ie4953b68049f45cee2f1097e890f6c7fbb5b99a8
2021-12-16 12:04:28 +00:00
Taras Antoshchuk
cf34e56459
Unhide RouteInfo#getType and related fields am: 62065db8d1 am: d44b6b9629 am: b8187e3b4a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784543
Change-Id: I39470864beda342f04b6729d3e2222c8da9215ba
2021-12-16 12:04:23 +00:00
Taras Antoshchuk
a44507ec2b
Merge changes from topic "vpn-impl" am: 8be6ba36dc am: e0895f355a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1551943
Change-Id: Ie1bc28917cd5f3a65ca28368dbc6a6f9614a8889
2021-12-16 11:49:30 +00:00
Taras Antoshchuk
21e769376b
Unhide IpPrefix(InetAddress, int) am: a5a1b80222 am: 6cf24035ca
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1831813
Change-Id: I7431738073135d9ad855808d013777e982b132fd
2021-12-16 11:49:28 +00:00
Taras Antoshchuk
b8187e3b4a
Unhide RouteInfo#getType and related fields am: 62065db8d1 am: d44b6b9629
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784543
Change-Id: I2bf2ed0090c7d47dd9c9b72a6ee64cd36693f9ae
2021-12-16 11:49:25 +00:00
Taras Antoshchuk
e0895f355a
Merge changes from topic "vpn-impl" am: 8be6ba36dc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1551943
Change-Id: I40ff9cefa8326f23f057c4f97b84d1e0bc6164ea
2021-12-16 11:34:52 +00:00
Taras Antoshchuk
6cf24035ca
Unhide IpPrefix(InetAddress, int) am: a5a1b80222
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1831813
Change-Id: I0f0cfe71d555249e08e4a3946295fd028864c323
2021-12-16 11:34:50 +00:00
Taras Antoshchuk
d44b6b9629
Unhide RouteInfo#getType and related fields am: 62065db8d1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784543
Change-Id: I2af963e9918ae08e31bce57283cf3fefdb64c3a7
2021-12-16 11:34:49 +00:00
Taras Antoshchuk
8be6ba36dc
Merge changes from topic "vpn-impl"
...
* changes:
Add CTS tests for exclude VPN routes APIs
Unhide IpPrefix(InetAddress, int)
Unhide RouteInfo#getType and related fields
2021-12-16 11:13:33 +00:00
Mark Chien
1290047da0
Merge "Reuse BluetoothPan object and use it under tethering handler thread" am: 5c4010e196 am: b823c10754 am: ba1285c1d1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1908683
Change-Id: I7fcd2c91384546b87a01e536470e709381aa6e19
2021-12-16 09:33:37 +00:00
Mark Chien
ba1285c1d1
Merge "Reuse BluetoothPan object and use it under tethering handler thread" am: 5c4010e196 am: b823c10754
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1908683
Change-Id: I03bea1e97c5eeecad0b1b74083c5080f6ce8594e
2021-12-16 09:18:41 +00:00
Mark Chien
b823c10754
Merge "Reuse BluetoothPan object and use it under tethering handler thread" am: 5c4010e196
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1908683
Change-Id: I7dd99696c2645cd36f19f5434297435a2a8ea2c7
2021-12-16 09:02:28 +00:00
Mark Chien
5c4010e196
Merge "Reuse BluetoothPan object and use it under tethering handler thread"
2021-12-16 08:40:39 +00:00
markchien
1e020903cc
Reuse BluetoothPan object and use it under tethering handler thread
...
1. Instead of create BluetoothPan every time when tethering need to use
it, store it with mBluetoothPan and resue it.
2. Call BluetoothPan function under tethering handler thread.
Bug: 190438212
Test: atest TetheringTests
Change-Id: I40adece59960ec44a02dc438d6bd95483a0788af
2021-12-16 12:12:07 +08:00
Aaron Huang
70e3b16dcf
Merge "Change to use Dependencies in IpSecService Tests" am: 286c0e5336 am: 90f307450c am: e4d6a01bcd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1904463
Change-Id: Ic7621cd1ae8faaab4021d33e42ccc2d9c4237c9b
2021-12-15 08:51:23 +00:00
Aaron Huang
e4d6a01bcd
Merge "Change to use Dependencies in IpSecService Tests" am: 286c0e5336 am: 90f307450c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1904463
Change-Id: I32de11dd80d23eefbfd17853f59d8eef194bc240
2021-12-15 08:33:13 +00:00
Aaron Huang
90f307450c
Merge "Change to use Dependencies in IpSecService Tests" am: 286c0e5336
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1904463
Change-Id: I6bf07e5d090d9087fec1cb1e11bed98e9203b6e1
2021-12-15 08:16:25 +00:00
Aaron Huang
286c0e5336
Merge "Change to use Dependencies in IpSecService Tests"
2021-12-15 07:53:23 +00:00
Xin Li
b6ffe5b3b5
[automerger skipped] Merge "Merge Android 12 QPR1" am: 93c578c7ca -s ours am: 781839dd40 -s ours am: bcd832e651 -s ours
...
am skip reason: Merged-In I4bfb3fc34f10d0c84dafc949f4e7f604d98244e1 with SHA-1 d109712194 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1921898
Change-Id: I4de6426fbaed81d84fa27b9f5cc14371da0a7086
2021-12-14 21:50:59 +00:00
Xin Li
bcd832e651
[automerger skipped] Merge "Merge Android 12 QPR1" am: 93c578c7ca -s ours am: 781839dd40 -s ours
...
am skip reason: Merged-In I4bfb3fc34f10d0c84dafc949f4e7f604d98244e1 with SHA-1 d109712194 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1921898
Change-Id: I1cc7f055633ca98b54d3ecdb87b45a3609459a5e
2021-12-14 21:24:04 +00:00
Xin Li
781839dd40
[automerger skipped] Merge "Merge Android 12 QPR1" am: 93c578c7ca -s ours
...
am skip reason: Merged-In I4bfb3fc34f10d0c84dafc949f4e7f604d98244e1 with SHA-1 d109712194 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1921898
Change-Id: Ic14a5146e901789ee2c6e4623cf560f6528eb2fc
2021-12-14 21:00:14 +00:00
Xin Li
93c578c7ca
Merge "Merge Android 12 QPR1"
2021-12-14 20:27:32 +00:00
Xin Li
06e662f597
Merge Android 12 QPR1
...
Bug: 210511427
Merged-In: I4bfb3fc34f10d0c84dafc949f4e7f604d98244e1
Change-Id: I9ff07a2256a709115a3d84370cfcd5fadc34b3a9
2021-12-14 08:39:15 -08:00
Remi NGUYEN VAN
4d44c36ed6
Merge "Move TestableNetworkAgent to Common Util Location" am: eef1e2033d am: d71552978c am: 7bf5e7e325
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1908520
Change-Id: I19e75581c18901eef23d4dd50ec62bbc6a8f66da
2021-12-14 13:37:47 +00:00
Remi NGUYEN VAN
7bf5e7e325
Merge "Move TestableNetworkAgent to Common Util Location" am: eef1e2033d am: d71552978c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1908520
Change-Id: Ida346e830fc8f08c75d45a68e3f7762f98e1b5fd
2021-12-14 13:24:58 +00:00
Remi NGUYEN VAN
d71552978c
Merge "Move TestableNetworkAgent to Common Util Location" am: eef1e2033d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1908520
Change-Id: I7f95f6a3d4750e4dfef2ec4e61db1837661f119d
2021-12-14 13:09:19 +00:00
Jean Chalard
bb8f815f25
Merge "Mark arg to NC#appliesToUidRange non-null" am: ec3013ddf4 am: 750e482077 am: ef019ffd9b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919249
Change-Id: Ifd4edfac07f77cb9e19e709987174b188f648259
2021-12-14 13:06:14 +00:00