LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,948 Commits 2 Branches 0 Tags
3b9f2fcc8c337ca0f4beec920edd07bc8587ec74
Commit Graph

4013 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
286c0e5336 Merge "Change to use Dependencies in IpSecService Tests" 2021-12-15 07:53:23 +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
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
Remi NGUYEN VAN
eef1e2033d Merge "Move TestableNetworkAgent to Common Util Location" 2021-12-14 12:49:15 +00:00
Jean Chalard
4c06947fce Merge "Remove NetworkCapabilities#combine*" am: 5469fa6e59 am: d5c9c3f4ae am: ad1cd95c10 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919248

Change-Id: I58462f6d0303803ffd43333b67865c57edef39a3
 2021-12-14 11:46:08 +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
ce0fdcb616 DnsException: run only on T+ versions am: 5d16f41639 am: cef564eb4f am: 1b29dd3d2b 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1921304

Change-Id: Ib1efecd41c6fa5fea46b1c443027f09bcd8353a8
 2021-12-14 05:00:54 +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
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
1ac62ba743 Merge changes from topic "DnsException" am: 0db3016398 am: d109712194 am: de3683b97c 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1908042

Change-Id: I432576048f5c094c43dc64d26060d83f876adad8
 2021-12-13 08:41:39 +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
Treehugger Robot
0db3016398 Merge changes from topic "DnsException" 
* changes:
  CTS DnsResolverTest for DnsException ctor
  DnsResolver: Make DnsException ctor public
 2021-12-13 07:48:28 +00:00
Aswin Sankar
7dca331853 Merge "DnsResolverTest: Use AndroidJUnit4.class" am: 85509fb3e4 am: 7e184fc11e am: 99292155a2 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1918397

Change-Id: Ic3f0edee27e579759dfa09c50c9096fc129485d5
 2021-12-13 07:29:04 +00:00
Aswin Sankar
7e184fc11e Merge "DnsResolverTest: Use AndroidJUnit4.class" am: 85509fb3e4 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1918397

Change-Id: Ifd5f103d5bfa2ea2d0817efff65aaa1a4c60b8a9
 2021-12-13 06:49:19 +00:00
Aswin Sankar
85509fb3e4 Merge "DnsResolverTest: Use AndroidJUnit4.class" 2021-12-13 06:28:08 +00:00
Jean Chalard
2658430120 Merge "Fix an issue where OEM pref tests don't clean up correctly" am: bbb7ae75d1 am: d2afada37a am: ed9604bacd 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1906316

Change-Id: I6becbf85bff36054086d9dccc5a26bd6720766fa
 2021-12-13 02:50:39 +00:00
Jean Chalard
d2afada37a Merge "Fix an issue where OEM pref tests don't clean up correctly" am: bbb7ae75d1 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1906316

Change-Id: Ifed130bc06f0d79f1039f31574b9d2a857564c8e
 2021-12-13 02:20:29 +00:00
Jean Chalard
bbb7ae75d1 Merge "Fix an issue where OEM pref tests don't clean up correctly" 2021-12-13 02:06:38 +00:00
Mingguang Xu
c3b974041b Add CTS for DhcpOption am: 4df5d1fdd2 am: 9e4d6d2dc6 am: 1a43b8b120 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1917689

Change-Id: I6eb9efccc18bed3a9fe81ad6d34e293f0e147ff6
 2021-12-11 02:29:22 +00:00
Mingguang Xu
9e4d6d2dc6 Add CTS for DhcpOption am: 4df5d1fdd2 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1917689

Change-Id: Ic4a33e417830ff534da1e56895159935b2a85ae9
 2021-12-11 01:51:37 +00:00
Mingguang Xu
4df5d1fdd2 Add CTS for DhcpOption 
Bug: 177278970

Test: this
Change-Id: Ia9a9384cb39c049253ead8f7eb594505ccf08333
 2021-12-10 23:26:36 +00:00
Treehugger Robot
23ec69be0f Merge "[MS07.2] Move NetworkStatsCollection/IdentitySet into frameworks" am: 7577131341 am: a9656625d2 am: bb49fe4bef 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895330

Change-Id: Id03f0efb4d052fd2da6bfd3d50bbb9a94cd299da
 2021-12-10 19:35:17 +00:00
Benedict Wong
8e6b02445e Merge "Add additional IPsec owners" am: b1c6bf8ece am: 81288cfce7 am: 9906f6e12e 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1910250

Change-Id: Ia424c7a5ee3dce24ad5cdbc34df31e3b51848d9c
 2021-12-10 19:34:42 +00:00
Aswin Sankar
ca942be00d CTS DnsResolverTest for DnsException ctor 
- Adds a CTS test to verify that DnsException
can be subclassed and its constructor re-used.

Test: Adds testDnsExceptionConstructor() CTS test.
Bug: 208479811
Change-Id: Ia1dffe8ad5252b61af5a6ef0f6630f075081a6d1
 2021-12-10 19:30:20 +00:00
Aswin Sankar
6ed0167930 DnsResolverTest: Use AndroidJUnit4.class 
These CTS tests previously extended AndroidTestCase, which made useful
annotations like 'DevSdkIgnoreRule' not take effect.

Test: CtsNetTestCasesLatestSdk
Bug: 208479811
Change-Id: I79f7e48167bb3bfbd4f6cde33d7e3907c2af6f74
 2021-12-10 19:30:15 +00:00
Treehugger Robot
a9656625d2 Merge "[MS07.2] Move NetworkStatsCollection/IdentitySet into frameworks" am: 7577131341 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895330

Change-Id: I3d84b1a82e07a9b4a56ddc88f3f81d875870517c
 2021-12-10 18:57:07 +00:00
Treehugger Robot
7577131341 Merge "[MS07.2] Move NetworkStatsCollection/IdentitySet into frameworks" 2021-12-10 18:48:52 +00:00
Aaron Huang
9792b5b5e6 Add makeDependencies method in IpSecService related tests 
Bug: 204153604
Test: FrameworksNetTest
Change-Id: Iea5731273e4772966466088f11a4c6334fa19f5d
 2021-12-10 12:11:20 +00:00