LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,577 Commits 2 Branches 0 Tags
626bac0e8c12005ff8ea261ba11192e0b2ff4246
Commit Graph

43577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
ef019ffd9b Merge "Mark arg to NC#appliesToUidRange non-null" am: ec3013ddf4 am: 750e482077 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919249

Change-Id: I24ee43a3eae03174f58362ee50ba93c0a2e81624
 2021-12-14 12:50:18 +00:00
Remi NGUYEN VAN
eef1e2033d Merge "Move TestableNetworkAgent to Common Util Location" 2021-12-14 12:49:15 +00:00
Jean Chalard
750e482077 Merge "Mark arg to NC#appliesToUidRange non-null" am: ec3013ddf4 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919249

Change-Id: I5e3afd55ebac6cb4944478a5fbcc5ced87227ce8
 2021-12-14 12:35:46 +00:00
Jean Chalard
ec3013ddf4 Merge "Mark arg to NC#appliesToUidRange non-null" 2021-12-14 12:17:27 +00:00
Jean Chalard
ad1cd95c10 Merge "Remove NetworkCapabilities#combine*" am: 5469fa6e59 am: d5c9c3f4ae 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919248

Change-Id: I6eccebda7c8c6ee9265bd06addb72a5e7fd56d3f
 2021-12-14 11:33:01 +00:00
Jean Chalard
d5c9c3f4ae Merge "Remove NetworkCapabilities#combine*" am: 5469fa6e59 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919248

Change-Id: I4b385d93b24ea85240dde589b2357543fb80c122
 2021-12-14 11:14:57 +00:00
Jean Chalard
5469fa6e59 Merge "Remove NetworkCapabilities#combine*" 2021-12-14 10:47:31 +00:00
Aswin Sankar
1b29dd3d2b DnsException: run only on T+ versions am: 5d16f41639 am: cef564eb4f 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1921304

Change-Id: I24b0b55bf2b9bcb687c3625420c94e39aecb35a4
 2021-12-14 04:48:15 +00:00
Aswin Sankar
cef564eb4f DnsException: run only on T+ versions am: 5d16f41639 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1921304

Change-Id: I81b7420a00fd8a0cce81db0e07dd76e0a9d6313c
 2021-12-14 04:29:38 +00:00
Aswin Sankar
5d16f41639 DnsException: run only on T+ versions 
- Test was failing on S mainline builds. Fixing forward.

Bug: 210540375
Test: CtsDnsResolverTests.
Change-Id: Ia980965c8ee1b9ddae99f593628f8b7ecfeca394
 2021-12-14 02:44:54 +00:00
Taras Antoshchuk
673eb6ecd2 Add CTS tests for exclude VPN routes APIs 
Add HostsideVpnTests test cases for different combinations of
included/excluded routes in VPN configuration.

Bug: 186082280
Test: atest HostsideVpnTests
Change-Id: I993a32d4066a851eb0c455aff2f599569e958ba7
 2021-12-13 18:47:58 +01:00
Chalard Jean
2873428835 Mark arg to NC#appliesToUidRange non-null 
This is always non-null, and if it's not it has a good
chance to throw anyway

Test: m
Change-Id: I1020ab9e6eb546390325cf6aa4d30183b2e69785
 2021-12-13 21:55:56 +09:00
Chalard Jean
bdf4f2987d Remove NetworkCapabilities#combine* 
This is no longer used outside of tests, and can be safely
removed.

Also this family of methods is fairly confusing, as while
it's well defined for some members, many later additions
had to be written so as to dissallow some combinations when
the workings of this family of methods didn't match the
semantics of some members, making them possibly dangerous
to use and at least exhibit difficult to understand semantics.

Test: FrameworksNetTests
      m
Change-Id: Ia69c20afa16c2153839891f6e33331caa9da33ff
 2021-12-13 21:15:34 +09:00
Taras Antoshchuk
a5a1b80222 Unhide IpPrefix(InetAddress, int) 
Unhide IpPrefix constructor to allow its usage with the new
VpnService.Builder#excludeRoute(IpPrefix) method.

Bug: 186082280
Test: atest IpPrefixTest
Change-Id: Ie5b62b2b206def1be53a41219681b4a8bc06c1d2
 2021-12-13 11:11:00 +01:00
Taras Antoshchuk
62065db8d1 Unhide RouteInfo#getType and related fields 
Bug: 186082280
Test: atest RouteInfoTest
Change-Id: I59b9185cf4f8f2afd691b49cf6b4659fe36e6bf8
 2021-12-13 11:11:00 +01:00
Treehugger Robot
de3683b97c Merge changes from topic "DnsException" am: 0db3016398 am: d109712194 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1908042

Change-Id: I4914af2a62515bc9cf0c97ed327728a7736313b0
 2021-12-13 08:26:36 +00:00
Treehugger Robot
d109712194 Merge changes from topic "DnsException" am: 0db3016398 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1908042

Change-Id: I4bfb3fc34f10d0c84dafc949f4e7f604d98244e1
 2021-12-13 08:04:17 +00:00