Commit Graph

43422 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Treehugger Robot
f575d053d4 Merge "Flake fix : Wait setting applied before returning from setConfig" 2021-12-06 06:27:54 +00:00
Tyler Wear
a7dd5f1f4a Move TestableNetworkAgent to Common Util Location
To prep TestableNetworkAgent being accessible for multiple
tests, move to common location.

Change-Id: I6c06ac926af003877a0f919e3b1403291d814f13
2021-12-03 10:11:28 -08:00
paulhu
850bd91c3a Remove NsdSettings from test
NsdSettings has been removed from NsdService, so the test needs
to update accordingly.

Bug: 206702844
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I23b6323b2d870746737370b9a3fc90e530e3d2ed
2021-12-03 22:26:39 +08:00
Ken Chen
303a4916de Merge "[NETD-BPF#4] Move bpf_shared.h from netd to module" am: 3f8d3ff9bf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1870274

Change-Id: Ic25002c1cb0ad702be4114b91ce5114da716531b
2021-12-03 09:20:00 +00:00
Ken Chen
3f8d3ff9bf Merge "[NETD-BPF#4] Move bpf_shared.h from netd to module" 2021-12-03 08:15:06 +00:00
Ken Chen
47790a1f63 Merge "[NETD-BPF#3] Relocate Tethering/bpf_progs and rename bpf_tethering_headers" am: 5fabfd8dd0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1870273

Change-Id: I4cb74d3265b36f028e4e08e8c06a3d5b503c6052
2021-12-02 13:09:45 +00:00
Ken Chen
5fabfd8dd0 Merge "[NETD-BPF#3] Relocate Tethering/bpf_progs and rename bpf_tethering_headers" 2021-12-02 12:54:01 +00:00
Treehugger Robot
f09b6f6414 Merge "Ensure created fd being closed" am: 5b98fb05d6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1904462

Change-Id: I52413f636dc427bd4568eb1bdd3db9da65f020ec
2021-12-01 11:10:23 +00:00
Treehugger Robot
5b98fb05d6 Merge "Ensure created fd being closed" 2021-12-01 10:49:26 +00:00
Chiachang Wang
0209c36662 Ensure created fd being closed
If exception s thrown while calling bindSocket(fd), the temporary
created ParcelFileDescriptor may not be closed as expected.

Ensure it's closed eventually.

Bug: 206042872
Test: atest FrameworksNetTests
Change-Id: Icde895978ab9281006ffd56335d1247462d9da28
2021-12-01 14:46:29 +08:00