Commit Graph

43432 Commits

Author SHA1 Message Date
Treehugger Robot
e44ea016e1 Merge "Rename libbpf to libbpf_bcc" 2021-12-17 00:37:05 +00:00
Treehugger Robot
a0d5980011 Merge "Genericize NC#hasSameUids" 2021-12-16 15:37:06 +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
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
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
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
3c1e7398a4 Merge "Add makeDependencies method in IpSecService related tests" 2021-12-16 12:32:41 +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
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
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
eef1e2033d Merge "Move TestableNetworkAgent to Common Util Location" 2021-12-14 12:49:15 +00:00
Jean Chalard
ec3013ddf4 Merge "Mark arg to NC#appliesToUidRange non-null" 2021-12-14 12:17:27 +00:00
Jean Chalard
5469fa6e59 Merge "Remove NetworkCapabilities#combine*" 2021-12-14 10:47:31 +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
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
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
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
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
Mingguang Xu
55cbbe7d15 Merge "Create DhcpOption object and make it a SystemApi" am: 0a416b65b1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1875313

Change-Id: Id6c9f9e696a76031041cf55aea6aee6a2ed43b17
2021-12-10 19:58:25 +00:00
Mingguang Xu
0a416b65b1 Merge "Create DhcpOption object and make it a SystemApi" 2021-12-10 19:43:02 +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
74cbfd5aab DnsResolver: Make DnsException ctor public
Making the DnsException constructor public is useful for apps
using DnsResolver to write their tests, and for internal packages
that may want to implement the DnsResolver.Callback interface.

Test: for regression; CTS tests in b/208479811
Bug: 208464882
Change-Id: I14641688f53721c96e6df9596a7506912ba3aec0
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
Mingguang Xu
2d87c6152d Create DhcpOption object and make it a SystemApi
This allows OEM apps to pass their custom DHCP options for establishing
network connection.

Bug: 177278970

Test: atest FrameworksNetTests
Test: atest NetworkStackTests

Signed-off-by: Mingguang Xu <mingguangxu@google.com>
Change-Id: I2b8c38ee9a948ad6edb666312c989d27a8ff904b
2021-12-09 19:37:40 -08:00
Junyu Lai
e9710f0918 [MS07.2] Move NetworkStatsCollection/IdentitySet into frameworks
These files are needed for the data migration util system Api
interfaces. Thus, they need to be moved into frameworks folder.

This change also set the @IgnoreUpTo annotation to S, since
these tests are testing purely platform code on S- devices which
is not really necessary for MTS. Also the tests are still covered
by the unit tests, since they are always verifying HEAD.

Test: TH
Bug: 197717846
Change-Id: I93c19b4860864c724be9f9f889ee2173f4605198
2021-12-09 08:43:16 +00:00
Benedict Wong
81288cfce7 Merge "Add additional IPsec owners" am: b1c6bf8ece
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1910250

Change-Id: Ic47c361c3f73abdafb367a5a40a4a5d553b8eabb
2021-12-08 18:54:07 +00:00
Benedict Wong
b1c6bf8ece Merge "Add additional IPsec owners" 2021-12-08 18:31:58 +00:00
Benedict Wong
40ba93d4cc Add additional IPsec owners
Test: Owners file changes only; no code changes
Change-Id: Ifd6ae33c68e72ad4c07abc4342ccbacebe86c220
2021-12-08 06:57:51 +00:00
Chiachang Wang
e5c363a3bd Merge "Enable strict_updatability_linting in connectivity src" am: 81bc609550
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1902533

Change-Id: I5cf42aa64a838f711cd1ecc589f86aecb19b358f
2021-12-08 02:53:16 +00:00
Chiachang Wang
81bc609550 Merge "Enable strict_updatability_linting in connectivity src" 2021-12-08 02:36:16 +00:00
Connor O'Brien
e0a64bb50c Rename libbpf to libbpf_bcc
This is to prevent a name collision with "upstream"
libbpf (external/libbpf) which is built using the same name.

Bug: 203823368
Test: m FrameworksNetTests
Signed-off-by: Connor O'Brien <connoro@google.com>
Change-Id: I9a009493fe0482967ab1f92516514715cfd457d6
2021-12-07 23:05:24 +00:00
Paul Hu
b8c0a764bd Merge "Remove NsdSettings from test" am: 5c3c3af9b6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1908687

Change-Id: Id2ff4ca8c54ea88966d78d4000384ea4aa780ad4
2021-12-07 06:01:16 +00:00
Paul Hu
5c3c3af9b6 Merge "Remove NsdSettings from test" 2021-12-07 05:43:44 +00:00
Treehugger Robot
5f5e9d2e37 Merge "Flake fix : Wait setting applied before returning from setConfig" am: f575d053d4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895332

Change-Id: Iee56a747ef47ca48a27d6f5abbc3352667fbaef3
2021-12-06 06:46:34 +00:00