Commit Graph

43559 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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