lucaslin
75ba4e7873
Define PRIVATE_DNS_MODE_OPPORTUNISTIC locally
...
The type of ConnectivityManager#PRIVATE_DNS_MODE_OPPORTUNISTIC
has changed from String to int, but the String definition is still
needed to update to Settings.Global.PRIVATE_DNS_MODE, so the
simplest way is to define one locally.
Bug: 185311744
Test: atest CtsNetTestCases
Change-Id: Iafcd861714d8aca44cede658ed630f9d5afd5e59
Ignore-AOSP-First: In the same TOPIC, there is a merge conflict in
DevicePolicyManagerService.java in the internal branch, so it's needed
to merge the code into internal branch to fix the merge conflict.
2021-04-26 07:34:24 +00:00
Chiachang Wang
67bc25eb33
Merge "Update doc in TestUtils" am: 8027d24eaf am: 3b5fd3154a am: 81fa7cc8d6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1684726
Change-Id: I197987806ba2f5e003dc939cffe2fb79eab5bfe3
2021-04-23 01:50:31 +00:00
Chiachang Wang
786749aa60
Merge "Update doc in TestUtils" am: 8027d24eaf am: 3b5fd3154a am: 6d7a9fa2cb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1684726
Change-Id: I2d0dccdee44227d21c6af65f1f0d90081724d7b5
2021-04-23 01:40:03 +00:00
Chiachang Wang
6d7a9fa2cb
Merge "Update doc in TestUtils" am: 8027d24eaf am: 3b5fd3154a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1684726
Change-Id: I09661d949feded17a1f1f45e660a66a73a0f1b2a
2021-04-23 01:18:10 +00:00
Chiachang Wang
81fa7cc8d6
Merge "Update doc in TestUtils" am: 8027d24eaf am: 3b5fd3154a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1684726
Change-Id: Ic43358e6d0670f07acc2a5ca6e79ba346f43675f
2021-04-23 01:17:58 +00:00
Chiachang Wang
3b5fd3154a
Merge "Update doc in TestUtils" am: 8027d24eaf
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1684726
Change-Id: I33f2149be5c24bfbe269f2f25bcfc25d11da22be
2021-04-23 00:50:19 +00:00
Chiachang Wang
8027d24eaf
Merge "Update doc in TestUtils"
2021-04-23 00:35:27 +00:00
Chiachang Wang
789811f267
Merge "Update APIs based on API review feedback" into sc-dev
2021-04-23 00:30:51 +00:00
Treehugger Robot
733780fd4b
Merge "Fix testKeepaliveWifiUnsupported failure" am: 3b55c68cc2 am: c856c57a92 am: 455ef41ef5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1684429
Change-Id: I1e5d2eafc493b165cb816ccdd6f1b9bb733a3aa3
2021-04-22 15:55:13 +00:00
Treehugger Robot
c041940b5c
Merge "Fix testKeepaliveWifiUnsupported failure" am: 3b55c68cc2 am: c856c57a92 am: 367e8bdc75
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1684429
Change-Id: I0b12536f2247c8d360506a6cae3891148a1a5197
2021-04-22 15:54:16 +00:00
Treehugger Robot
367e8bdc75
Merge "Fix testKeepaliveWifiUnsupported failure" am: 3b55c68cc2 am: c856c57a92
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1684429
Change-Id: I3d81d13647a923c3c37121bc99d5238b14d94e62
2021-04-22 15:34:04 +00:00
Treehugger Robot
455ef41ef5
Merge "Fix testKeepaliveWifiUnsupported failure" am: 3b55c68cc2 am: c856c57a92
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1684429
Change-Id: If346d0f024f4854a7d165c3f72f035a25fb66c2b
2021-04-22 15:33:53 +00:00
Treehugger Robot
c856c57a92
Merge "Fix testKeepaliveWifiUnsupported failure" am: 3b55c68cc2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1684429
Change-Id: Iabf2fd3919523abf771908f4c5a4ad6c9b2710e2
2021-04-22 15:03:36 +00:00
Treehugger Robot
3b55c68cc2
Merge "Fix testKeepaliveWifiUnsupported failure"
2021-04-22 14:40:40 +00:00
Chalard Jean
a2755fbae3
Merge "Adjust a test for policy scoring" into sc-dev
2021-04-22 13:24:32 +00:00
Remi NGUYEN VAN
285d3a5da7
Fix testKeepaliveWifiUnsupported failure
...
As a temporary measure to get the test to pass, use the
QUERY_ALL_PACKAGES permission when calling getSupportedKeepalives.
This is helps as getSupportedKeepalives obtains the configuration
from resources in the connectivity resources package, which
recently got its own non-platform certificate and is now not
visible from the test anymore.
getSupportedKeepalives is only used by tests and ConnectivityService
which has all permissions.
The actual fix should make sure getSupportedKeepalives does not require
such a permission (although getSupportedKeepalives is not a formal API),
but this will take more time and the test needs to stay green in the
meantime.
Bug: 186093901
Test: atest CtsNetTestCases
Change-Id: I288ec13a6f0840b184f1c919785724733ca56adf
2021-04-22 21:35:34 +09:00
Chiachang Wang
f55413a5d9
Merge "Add test for NetworkRequest.Builder(NetworkRequest)" am: 28f3e69a25 am: 44f9593f24 am: 1230993fb4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1650232
Change-Id: I2d18de3b13fe687b5dfdf5ded5caa62f15de3644
2021-04-22 11:10:31 +00:00
Chiachang Wang
6bf5db23c7
Merge "Add test for NetworkRequest.Builder(NetworkRequest)" am: 28f3e69a25 am: 44f9593f24 am: 9f699e0815
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1650232
Change-Id: I5c944661cbc4ba2ae3118d1eb9cd477f858682a1
2021-04-22 11:10:11 +00:00
Chiachang Wang
1230993fb4
Merge "Add test for NetworkRequest.Builder(NetworkRequest)" am: 28f3e69a25 am: 44f9593f24
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1650232
Change-Id: Id1368ca84be2b04b7d3356ecdf11d40ab21bba20
2021-04-22 10:48:51 +00:00
Chiachang Wang
9f699e0815
Merge "Add test for NetworkRequest.Builder(NetworkRequest)" am: 28f3e69a25 am: 44f9593f24
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1650232
Change-Id: I78b7cd5255202ca9ec8fe63f4cb6c728376d3e9a
2021-04-22 10:48:36 +00:00
Chiachang Wang
44f9593f24
Merge "Add test for NetworkRequest.Builder(NetworkRequest)" am: 28f3e69a25
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1650232
Change-Id: Iff282ee441837b517bcea874a08734d6f6d1e77f
2021-04-22 10:23:31 +00:00
Chiachang Wang
d514b53eca
Update doc in TestUtils
...
Follow up commit from aosp/1650232 to update the doc
Bug: 186061922
Test: m
Change-Id: Icb622516bc41de5cbe3112d7abd3df9d83448b32
2021-04-22 18:19:58 +08:00
Chiachang Wang
28f3e69a25
Merge "Add test for NetworkRequest.Builder(NetworkRequest)"
2021-04-22 09:58:54 +00:00
Chalard Jean
d95d122e3d
Adjust a test for policy scoring
...
Ignore-AOSP-First: This code is not in AOSP yet
Bug: 184834350
Test: this
Change-Id: Ib161503c0e6f73c5b5017ae554bbdc28ac3edb3e
2021-04-22 09:22:16 +00:00
Chiachang Wang
93b807718b
Add test for NetworkRequest.Builder(NetworkRequest)
...
Build NetworkRequest using builder from an existing
NetworkRequest is exposed to API surface, so add a test to
verify its behavior works as expectation.
Also, create a TestUtils in the cts to put the multiple
reference methods(shouldTestSApis) to prevent duplication.
Bug: 186061922
Test: atest CtsNetTestCases:android.net.cts.NetworkRequestTest
in current sdk
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkRequestTest
in R and current sdk
Test: atest android.net.cts.ConnectivityManagerTest#\
testRegisterNetworkCallback
Change-Id: I46318e212d51e4e13efa86e8b9c3ca7326d62b77
2021-04-22 02:30:26 +00:00
Junyu Lai
e5ca854bb6
Merge changes from topic "sp32" into sc-dev
...
* changes:
[SP32] Try to get 1.1 OffloadControl hardware if available
[SP32.3] No-op refactoring of OffloadControllerTest
2021-04-21 01:45:15 +00:00
junyulai
184d458181
[SP32] Try to get 1.1 OffloadControl hardware if available
...
This is a no-op change that try to use 1.1 HAL if available.
Otherwise, fallback to 1.0 HAL. The change also provides version
information for subsequent patches to determine what to do for
specific version.
Test: atest TetheringTests
Bug: 149467454
Ignore-AOSP-First: avoid long automerger delay
Change-Id: I6a3ce877cdff2496087b97b191a9bfd5b0792827
2021-04-20 17:34:11 +08:00
Chiachang Wang
7f46cda1aa
Update APIs based on API review feedback
...
Update the usage in callers side for
- Rename NetworkAgent#setTeardownDelayMs to
NetworkAgent#setTeardownDelayMillis
- Use getters instead of fields in VpnTransportInfo
- Rename registerDefaultNetworkCallbackAsUid to
registerDefaultNetworkCallbackForUid in ConnectiivityManager
Bug: 183972850
Bug: 185246410
Fix: 184735863
Test: atest FrameworksNetTests
Test: atest CtsNetTestCasesLatestSdk
Change-Id: Ie542e5ad631388d9948dd27de21bc218b5b5b8f2
Ignore-AOSP-First: Prevernt build break by automerger
2021-04-20 08:57:39 +00:00
junyulai
36aa3f237c
[SP32.3] No-op refactoring of OffloadControllerTest
...
This is necessary change for minimize the code size when
repeatedly restarting OffloadController in subsequent
patches.
Test: atest TetheringTests
Bug: 149467454
Ignore-AOSP-First: avoid long automerger delay
Change-Id: I0b02d01cd8749d81c9d020dee7fdb4f80e18ae98
2021-04-20 11:26:10 +08:00
Lorenzo Colitti
5a46aa4608
Merge "Allow callers of startTethering to choose local-only mode." am: ac9ce08d45 am: af691a13b6 am: 45e5965e2f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674232
Change-Id: I70e325edb6358c5b80bb39689a8558cdc4e81f6f
2021-04-19 15:22:36 +00:00
Lorenzo Colitti
ffdc597a11
Merge "Allow callers of startTethering to choose local-only mode." am: ac9ce08d45 am: af691a13b6 am: f772ab1c61
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674232
Change-Id: I308835fd656b7c61d04f04b816babd0e2031df89
2021-04-19 15:21:56 +00:00
Lorenzo Colitti
f772ab1c61
Merge "Allow callers of startTethering to choose local-only mode." am: ac9ce08d45 am: af691a13b6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674232
Change-Id: I9c88d0d05c6dbb0bac65b72e8d54df5eb25b4060
2021-04-19 14:51:21 +00:00
Lorenzo Colitti
45e5965e2f
Merge "Allow callers of startTethering to choose local-only mode." am: ac9ce08d45 am: af691a13b6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674232
Change-Id: If54ea1076b0a3f51b1b6eea77f6941186a229b51
2021-04-19 14:51:13 +00:00
Lorenzo Colitti
af691a13b6
Merge "Allow callers of startTethering to choose local-only mode." am: ac9ce08d45
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674232
Change-Id: Ifd9c2c87023711aefc314ccb92bc7cde00a83bb2
2021-04-19 14:24:46 +00:00
Lorenzo Colitti
ac9ce08d45
Merge "Allow callers of startTethering to choose local-only mode."
2021-04-19 14:10:32 +00:00
Lorenzo Colitti
8a36c297bc
Allow callers of startTethering to choose local-only mode.
...
This is useful for OEMs that want to use RNDIS or NCM as a
local-only link that is directly connected to some other host.
This can be used to implement USB tethering using NCM, which
currently only supports local-only mode.
Bug: 175090447
Test: TetheringIntegrationTests:EthernetTetheringTest#testLocalOnlyTethering
Change-Id: I0ffaa46e4640e5b235340a15d25909106ceb0c07
2021-04-19 20:25:58 +09:00
Treehugger Robot
dcb5161417
Merge "Move CtsHostsideNetworkTests to group presubmit-large" am: c3bac64a94 am: b0e2855252 am: 7a4a243750
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674227
Change-Id: Ib268ad82b883e527858067b7dd92db1236c309bd
2021-04-19 04:15:40 +00:00
Treehugger Robot
c7d350f66a
Merge "Move CtsHostsideNetworkTests to group presubmit-large" am: c3bac64a94 am: b0e2855252 am: 45a26a4aa2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674227
Change-Id: Ice6daa7d9f5bfb3481fa7579398416cd42c6f3c8
2021-04-19 04:14:41 +00:00
Treehugger Robot
7a4a243750
Merge "Move CtsHostsideNetworkTests to group presubmit-large" am: c3bac64a94 am: b0e2855252
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674227
Change-Id: Ie3cdcb7a7b5a4147c84f830a688b588add73ea16
2021-04-19 03:54:02 +00:00
Treehugger Robot
45a26a4aa2
Merge "Move CtsHostsideNetworkTests to group presubmit-large" am: c3bac64a94 am: b0e2855252
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674227
Change-Id: I2ff565e0a753cd133972f34eff2fb9fc9bd27678
2021-04-19 03:53:58 +00:00
Treehugger Robot
b0e2855252
Merge "Move CtsHostsideNetworkTests to group presubmit-large" am: c3bac64a94
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674227
Change-Id: I38dae7f191204502c9c9d2abaa9468d843763605
2021-04-19 03:32:18 +00:00
Treehugger Robot
c3bac64a94
Merge "Move CtsHostsideNetworkTests to group presubmit-large"
2021-04-19 03:05:59 +00:00
Junyu Lai
21efd39fef
[automerger skipped] Merge "[VCN20.2] Change requestBackgroundNetwork argument order" am: afd18ddd57 am: d1c84ae89c am: 3d6ee87893 -s ours
...
am skip reason: skip tag Change-Id I09ff7461b655cbfc6ed5a7db07e02a388cd3d079 with SHA-1 8b5e4b4b4d is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1676442
Change-Id: I0a91a900cb9b71410698119c6071916d469224c7
2021-04-16 17:16:07 +00:00
Junyu Lai
b6efeebb05
[automerger skipped] Merge "[VCN20.2] Change requestBackgroundNetwork argument order" am: afd18ddd57 am: d1c84ae89c am: 34006332a1 -s ours
...
am skip reason: skip tag Change-Id I09ff7461b655cbfc6ed5a7db07e02a388cd3d079 with SHA-1 8b5e4b4b4d is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1676442
Change-Id: Icd8af84eefac86862c88776fce2fa598cd80986e
2021-04-16 17:15:30 +00:00
Junyu Lai
34006332a1
Merge "[VCN20.2] Change requestBackgroundNetwork argument order" am: afd18ddd57 am: d1c84ae89c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1676442
Change-Id: I68ab7fc43774c3ea977219261857930c703f6ea9
2021-04-16 16:52:15 +00:00
Junyu Lai
3d6ee87893
Merge "[VCN20.2] Change requestBackgroundNetwork argument order" am: afd18ddd57 am: d1c84ae89c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1676442
Change-Id: I394ca7487b5168c0f5d7b69d4f6fee2debd86fac
2021-04-16 16:52:07 +00:00
Junyu Lai
d1c84ae89c
Merge "[VCN20.2] Change requestBackgroundNetwork argument order" am: afd18ddd57
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1676442
Change-Id: Ie99d30e70de1cf1593448629532a90b4edc2d17b
2021-04-16 16:25:55 +00:00
Junyu Lai
afd18ddd57
Merge "[VCN20.2] Change requestBackgroundNetwork argument order"
2021-04-16 16:04:31 +00:00
Treehugger Robot
e2b12753cd
Merge "Fix CTS fail to register network callback since lack of permission" am: f7d188c8c9 am: 9da7347603 am: 9e7affed67
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674237
Change-Id: Ie7d72fb1f86626d1bcef3efd305731c6fd85deb4
2021-04-15 17:13:50 +00:00
Treehugger Robot
15bc33f87d
Merge "Fix CTS fail to register network callback since lack of permission" am: f7d188c8c9 am: 9da7347603 am: 0dc94a353e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674237
Change-Id: I7564fa7cf1f8c5d9e73044ccf8411f08f42a3c77
2021-04-15 16:32:49 +00:00