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
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
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
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
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
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
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
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
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
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
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
99292155a2
Merge "DnsResolverTest: Use AndroidJUnit4.class" am: 85509fb3e4 am: 7e184fc11e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1918397
Change-Id: Ia02822c90b855059670a9a8512d008d36d34ece3
2021-12-13 07:14:18 +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
ed9604bacd
Merge "Fix an issue where OEM pref tests don't clean up correctly" am: bbb7ae75d1 am: d2afada37a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1906316
Change-Id: I28a2202d13622cc29fcef3901787bcd720c90c20
2021-12-13 02:35:23 +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
1a43b8b120
Add CTS for DhcpOption am: 4df5d1fdd2 am: 9e4d6d2dc6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1917689
Change-Id: Ib667920581ca051307ed6b88a2f7ca00550dee16
2021-12-11 02:08:53 +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
0682921185
Merge "Create DhcpOption object and make it a SystemApi" am: 0a416b65b1 am: 55cbbe7d15 am: 375b5fdb6c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1875313
Change-Id: Id4c07630f7e86159f41776f9834e13472c55de38
2021-12-10 20:32:41 +00:00
Mingguang Xu
375b5fdb6c
Merge "Create DhcpOption object and make it a SystemApi" am: 0a416b65b1 am: 55cbbe7d15
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1875313
Change-Id: Ie43b638ad7617e82089da88bf3fec343d10ca4ac
2021-12-10 20:15:53 +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
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
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
bb49fe4bef
Merge "[MS07.2] Move NetworkStatsCollection/IdentitySet into frameworks" am: 7577131341 am: a9656625d2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895330
Change-Id: I451e7bbf8a3bf1c3cf3631fe6f5ca742b4696c2a
2021-12-10 19:20:32 +00:00
Benedict Wong
9906f6e12e
Merge "Add additional IPsec owners" am: b1c6bf8ece am: 81288cfce7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1910250
Change-Id: If21f60a4ec75f76ff633a406955829ad4753163d
2021-12-10 19:20:00 +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
8e4530c439
Merge "Enable strict_updatability_linting in connectivity src" am: 81bc609550 am: e5c363a3bd am: 6a1c5dc295
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1902533
Change-Id: I30bcf47dc757cd3fa8672aa9bc775ba612daa65a
2021-12-08 03:29:53 +00:00
Chiachang Wang
6a1c5dc295
Merge "Enable strict_updatability_linting in connectivity src" am: 81bc609550 am: e5c363a3bd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1902533
Change-Id: I72d4c4b29530a8c0b93f368bbb6ce7cbb44e4b8f
2021-12-08 03:17:06 +00:00