Lorenzo Colitti
68aa339ff6
[automerger skipped] Merge changes from topic "connectivity-cts-cherrypicks" into sc-dev am: 77fb999ed0 am: 2f329557bd -s ours
...
am skip reason: Merged-In I55371fabe0d2fa32a71520af11f18f1eeea31460 with SHA-1 56bc7d4dde is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057280
Change-Id: I5d273cabb28391d5a05844ce2cdd720c53f5b24c
2021-06-22 23:41:21 +00:00
Lucas Lin
df5dbfbf91
[automerger skipped] Add CTS for systemReady() & getIpSecNetIdRange() am: 03a1a97bf9 am: 22d513f17b -s ours
...
am skip reason: Merged-In I0b286f32389501402e552010546c62f3e56833d6 with SHA-1 b781a94ccf is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14185507
Change-Id: Ic2e2320370b608a448d59ba6ff225ca325de4835
2021-06-22 23:41:19 +00:00
Lucas Lin
1e5d020cb0
[automerger skipped] Call ConnectivitySettingsUtils to set/get private DNS related settings am: 611bc021e6 am: c948e1e561 -s ours
...
am skip reason: Merged-In I3272c825b86ec30c3d0bf4097088c653e668461b with SHA-1 8962128a0b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14728963
Change-Id: I28d3d400da5ae2aa7b9b085223d2c6d486d58f4a
2021-06-22 23:41:17 +00:00
Lucas Lin
4f70b035d8
[automerger skipped] Add CTS for isUidNetworkingBlocked & isUidRestrictedOnMeteredNetworks am: 77cb456671 am: a42cb345fc -s ours
...
am skip reason: Merged-In Ie6bda8570979b10a28dbeb20f6db7a9c44735964 with SHA-1 0639afa9ca is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057281
Change-Id: Ied51dba954d4d04376c6b89574617376958e1130
2021-06-22 23:41:15 +00:00
Paul Hu
e4704eb6b5
[automerger skipped] Add test for CSM#[get|set]MobileDataPreferredUids am: e4a2abad44 am: eff0815504 -s ours
...
am skip reason: Merged-In I43dfb049c271602526fa3e89ebb91219c7785a21 with SHA-1 8c96badb5d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057278
Change-Id: I28c263757d7e0b2ddd8ae928c53aa45e60fa9d18
2021-06-22 23:41:13 +00:00
Treehugger Robot
d7e2e3b71e
[automerger skipped] Add test for setHttpProxyConfiguration am: 34c8be9ac7 am: 58b926dc3d -s ours
...
am skip reason: Merged-In Id15909c5e52f1042d7210cf7e416874bb01baee7 with SHA-1 ef93a5cc4b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057277
Change-Id: I9774a4ba72f44f409626996f4b485a18a099483a
2021-06-22 23:41:11 +00:00
Aaron Huang
3deec1ee7f
[automerger skipped] CTS test for PacProxyManager am: 1eb05790a2 am: c129f703af -s ours
...
am skip reason: Merged-In I88cf3ecac12f4e8726d95a9b051e83eb719b0702 with SHA-1 d63cca284a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15044628
Change-Id: I7d1e38ebf3f2e5ac45a63fa2b137263913cb4143
2021-06-22 23:41:09 +00:00
Chiachang Wang
648f7bb1b6
[automerger skipped] Add test for CM#setAcceptUnvalidated am: 1981466747 am: 122ffec057 -s ours
...
am skip reason: Merged-In I803eb975fb0b6c52d55b2310293bcad407d21f42 with SHA-1 901eeb201d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057289
Change-Id: I9686ef54f82a7174cf0982899ebfa8ddbdaaf77d
2021-06-22 23:41:07 +00:00
Chiachang Wang
a163fbdb5b
[automerger skipped] Add test for CM#setAcceptPartialConnectivity am: b9c9e07fe2 am: efd3529957 -s ours
...
am skip reason: Merged-In Iba312defb6f02896eac518d71d36f1ef3df3d00b with SHA-1 589105d385 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057288
Change-Id: Ie791c2b02cf05b690a7f8660d51dc80def83ab5d
2021-06-22 23:41:05 +00:00
Treehugger Robot
8ba0d60f2b
[automerger skipped] Skip CaptivePortalTest for wearables am: ecad16cf28 am: 9efcf648b4 -s ours
...
am skip reason: Merged-In Iaf1a799d0cda1d7156fedcdab34184a52f351fbf with SHA-1 679264f388 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057282
Change-Id: Ic488f4c6284a9757ce94340150a114a6cf5fed9f
2021-06-22 23:41:03 +00:00
Treehugger Robot
10f361ed2c
[automerger skipped] Improve handling of invalid private DNS settings am: 4a15140077 am: a7f700db74 -s ours
...
am skip reason: Merged-In I45adc527267aa86d52e824f426699c5a7e874f63 with SHA-1 c2303139ef is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057279
Change-Id: If128b8daf4f9bede5a613bd565341d08d95e868f
2021-06-22 23:40:58 +00:00
Yan Yan
66af1e9a27
Merge "Test updating underlying network of IpSecTunnelInterface" am: 010ec2cddd am: 0783fed2ba am: b205411479
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1488296
Change-Id: I7e2eac529fc66711ff20cac31c8a0723ecf55176
2021-06-22 23:36:05 +00:00
Treehugger Robot
ccc4cc59f2
[automerger skipped] Add a test for ConnectivityFrameworkInitializer am: 3750a9f12e -s ours am: 3cadba47c7 -s ours
...
am skip reason: Merged-In I485b0dbd2e9dc557560a2b7bee2cff54c7f66c93 with SHA-1 944d87d179 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057276
Change-Id: I100d7a19c7dd6153406e4c2aab5fcfd764d18577
2021-06-22 23:35:59 +00:00
Remi NGUYEN VAN
9caa35a77d
[automerger skipped] Merge changes I49e5a99f,Ia3e4b336 into sc-dev am: 77fdd31db1 -s ours am: e72bac1be4 -s ours
...
am skip reason: Merged-In I49e5a99f18a5651370e6914f30be659134b537ff with SHA-1 4dad9710e1 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15054374
Change-Id: Ia867bf40982a0fe2045f346727faaab00448a72b
2021-06-22 23:35:55 +00:00
Mark Chien
922fcaab13
[automerger skipped] Merge "Disable tryCell when UpstreamMonitor stop" into sc-dev am: 07584931b5 -s ours am: 33f2121413 -s ours
...
am skip reason: Merged-In I5505655f52da9fdca2fd43a58e043a9ab727741d with SHA-1 89f2670b65 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057271
Change-Id: I97f5c246954934307af0ce97d9885ded0e4f479b
2021-06-22 23:35:50 +00:00
Lorenzo Colitti
06f4e7bc1e
[automerger skipped] Merge changes I270ff43c,Ifc7eee24 into sc-dev am: 6cea6edc9c -s ours am: 285821741c -s ours
...
am skip reason: Merged-In I270ff43c01736b9d18bd40a8e88e1379e9e4e863 with SHA-1 76e2e1c702 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15044629
Change-Id: If882d6758479021a6704b00aa1f5d1ac5dffc47d
2021-06-22 23:35:45 +00:00
Paul Hu
d6ba373eab
Merge "Add test for CSM#[get|set]MobileDataPreferredUids" am: 5440e0b8e8 am: 732ab7557c am: e203a29272
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736504
Change-Id: I8d932bd538ba91326d0a4db2d13130f63f1a82c6
2021-06-22 23:35:39 +00:00
Lucas Lin
162b4c0a8a
Merge "Add CTS for isUidNetworkingBlocked & isUidRestrictedOnMeteredNetworks" am: 3f565a44b0 am: d7e6b4dfa9 am: 3345e0d602
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737395
Change-Id: I75fc790519db08424dc43ce614463bb2781cd927
2021-06-22 23:35:29 +00:00
Lorenzo Colitti
2f329557bd
Merge changes from topic "connectivity-cts-cherrypicks" into sc-dev am: 77fb999ed0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057280
Change-Id: I197cb49c4f4515fd652ee1056120abf01088ed56
2021-06-22 23:29:53 +00:00
Lucas Lin
22d513f17b
Add CTS for systemReady() & getIpSecNetIdRange() am: 03a1a97bf9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14185507
Change-Id: Ib2f17932bd37c65bc693ae06aa2af53d82a9e920
2021-06-22 23:29:51 +00:00
Lucas Lin
c948e1e561
Call ConnectivitySettingsUtils to set/get private DNS related settings am: 611bc021e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14728963
Change-Id: I00d62fe6df6b229050de2cd5dfbad28aa843923d
2021-06-22 23:29:48 +00:00
Lucas Lin
a42cb345fc
Add CTS for isUidNetworkingBlocked & isUidRestrictedOnMeteredNetworks am: 77cb456671
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057281
Change-Id: Ic269ff69cda4d9c340ad66530a5987b0c79bde02
2021-06-22 23:29:46 +00:00
Paul Hu
eff0815504
Add test for CSM#[get|set]MobileDataPreferredUids am: e4a2abad44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057278
Change-Id: I9afce730c6748f9d90263e3e2087b6be7b982262
2021-06-22 23:29:44 +00:00
Treehugger Robot
58b926dc3d
Add test for setHttpProxyConfiguration am: 34c8be9ac7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057277
Change-Id: Ic340a982573775b663dae427dee20bcb9d15f6ae
2021-06-22 23:29:42 +00:00
Aaron Huang
c129f703af
CTS test for PacProxyManager am: 1eb05790a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15044628
Change-Id: Icbaa52b423f9472b95852d5f12c60e50b82331fd
2021-06-22 23:29:39 +00:00
Chiachang Wang
122ffec057
Add test for CM#setAcceptUnvalidated am: 1981466747
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057289
Change-Id: If5696613a1dcee18dd6c46fd5469f31f92f48194
2021-06-22 23:29:37 +00:00
Chiachang Wang
efd3529957
Add test for CM#setAcceptPartialConnectivity am: b9c9e07fe2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057288
Change-Id: I9d537261dad7cfee3dd2405a68ef965d25046c5e
2021-06-22 23:29:35 +00:00
Treehugger Robot
9efcf648b4
Skip CaptivePortalTest for wearables am: ecad16cf28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057282
Change-Id: Id05181a78898e9ea081ee9f9d309dced6f37a314
2021-06-22 23:29:33 +00:00
Treehugger Robot
a7f700db74
Improve handling of invalid private DNS settings am: 4a15140077
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057279
Change-Id: Ia40a4a43c5d9df8f3974d0fc079a8067cf0a35d9
2021-06-22 23:29:29 +00:00
Lorenzo Colitti
77fb999ed0
Merge changes from topic "connectivity-cts-cherrypicks" into sc-dev
...
* changes:
Use assertEquals instead of assertTrue to compare the vpn type
Add CTS for systemReady() & getIpSecNetIdRange()
Call ConnectivitySettingsUtils to set/get private DNS related settings
Add CTS for isUidNetworkingBlocked & isUidRestrictedOnMeteredNetworks
Add test for CSM#[get|set]MobileDataPreferredUids
Add test for setHttpProxyConfiguration
CTS test for PacProxyManager
Add test for CM#setAcceptUnvalidated
Add test for CM#setAcceptPartialConnectivity
Skip CaptivePortalTest for wearables
Improve handling of invalid private DNS settings
2021-06-22 22:53:26 +00:00
Yan Yan
b205411479
Merge "Test updating underlying network of IpSecTunnelInterface" am: 010ec2cddd am: 0783fed2ba
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1488296
Change-Id: I269747f4c2e575d8afb89fcc7685d9fab6d49c31
2021-06-22 17:59:12 +00:00
Yan Yan
0783fed2ba
Merge "Test updating underlying network of IpSecTunnelInterface" am: 010ec2cddd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1488296
Change-Id: I41f60bf0bc369b2ea43107355855bfba02ab9e9f
2021-06-22 17:44:29 +00:00
Yan Yan
010ec2cddd
Merge "Test updating underlying network of IpSecTunnelInterface"
2021-06-22 17:27:11 +00:00
Treehugger Robot
de982e0b35
[automerger skipped] Add a test for ConnectivityFrameworkInitializer am: 3750a9f12e am: b502c907d9 -s ours
...
am skip reason: Merged-In I485b0dbd2e9dc557560a2b7bee2cff54c7f66c93 with SHA-1 944d87d179 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057276
Change-Id: Ifef8b097101d905c75e841f917f20c105ba8cc1c
2021-06-22 11:52:35 +00:00
Treehugger Robot
b502c907d9
Add a test for ConnectivityFrameworkInitializer am: 3750a9f12e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057276
Change-Id: I2df700fcadf39e2e6f540397d80cf0f6c6b960a8
2021-06-22 11:39:25 +00:00
Treehugger Robot
3cadba47c7
[automerger skipped] Add a test for ConnectivityFrameworkInitializer am: 3750a9f12e -s ours
...
am skip reason: Merged-In I485b0dbd2e9dc557560a2b7bee2cff54c7f66c93 with SHA-1 944d87d179 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057276
Change-Id: I8867bd56daf07dff35903a27991840fb974015dd
2021-06-22 11:38:25 +00:00
Remi NGUYEN VAN
7cce8a66fe
[automerger skipped] Merge changes I49e5a99f,Ia3e4b336 into sc-dev am: 77fdd31db1 am: f9678d1008 -s ours
...
am skip reason: Merged-In I49e5a99f18a5651370e6914f30be659134b537ff with SHA-1 4dad9710e1 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15054374
Change-Id: Ie4228b266a3822aba482db27404b444a7a5d4e21
2021-06-22 10:25:58 +00:00
James Mattis
6d0ac08cce
[automerger skipped] CTS tests for setOemNetworkPreference am: 904351cdcf am: 1bd9423329 -s ours
...
am skip reason: Merged-In Ia3e4b336123b60f6df1582aca2979129112afedc with SHA-1 db143f99cf is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15054373
Change-Id: I6289dbac224a52cde7702f3ecc2a68ddd8232597
2021-06-22 10:25:55 +00:00
Remi NGUYEN VAN
f9678d1008
Merge changes I49e5a99f,Ia3e4b336 into sc-dev am: 77fdd31db1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15054374
Change-Id: I99ef58f523c1160e32911b56842202e0657f4015
2021-06-22 10:12:03 +00:00
James Mattis
1bd9423329
CTS tests for setOemNetworkPreference am: 904351cdcf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15054373
Change-Id: I32e8c57466997ff95c6251552ddb00d5e54d19f4
2021-06-22 10:12:00 +00:00
Remi NGUYEN VAN
e72bac1be4
[automerger skipped] Merge changes I49e5a99f,Ia3e4b336 into sc-dev am: 77fdd31db1 -s ours
...
am skip reason: Merged-In I49e5a99f18a5651370e6914f30be659134b537ff with SHA-1 4dad9710e1 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15054374
Change-Id: I3ca7ef1325d4f04a138bf8012de57bbb89825bd4
2021-06-22 10:08:43 +00:00
Treehugger Robot
3750a9f12e
Add a test for ConnectivityFrameworkInitializer
...
The test verifies that system services were registered, meaning that
ConnectivityFrameworkInitializer.registerServiceWrappers ran
successfully on startup, and that calling it afterwards throws.
Bug: 171540887
Test: atest ConnectivityFrameworkInitializerTest
Original-Change: https://android-review.googlesource.com/1675598
Merged-In: I485b0dbd2e9dc557560a2b7bee2cff54c7f66c93
Change-Id: I485b0dbd2e9dc557560a2b7bee2cff54c7f66c93
2021-06-22 09:31:14 +00:00
Lucas Lin
da2a7c3daa
Use assertEquals instead of assertTrue to compare the vpn type
...
Bug: 184261389
Test: atest CtsHostsideNetworkTests:HostsideVpnTests#testDefault
Original-Change: https://android-review.googlesource.com/1739093
Merged-In: I55371fabe0d2fa32a71520af11f18f1eeea31460
Change-Id: I55371fabe0d2fa32a71520af11f18f1eeea31460
2021-06-22 09:24:49 +00:00
Lucas Lin
03a1a97bf9
Add CTS for systemReady() & getIpSecNetIdRange()
...
Bug: 182963354
Test: 1. atest CtsNetTestCases:ConnectivityManagerTest
2. atest CtsNetTestCasesLatestSdk:ConnectivityManagerTest
Original-Change: https://android-review.googlesource.com/1676425
Merged-In: I0b286f32389501402e552010546c62f3e56833d6
Change-Id: I0b286f32389501402e552010546c62f3e56833d6
2021-06-22 09:24:44 +00:00
Lucas Lin
611bc021e6
Call ConnectivitySettingsUtils to set/get private DNS related settings
...
ConnectivitySettingsManager and CtsNetUtils are doing the same
thing to set/get private DNS related settings.
To prevent making the duplication code in two places, move the
body to frameworks/libs/net and call it.
Bug: 185311744
Test: atest CtsNetTestCases CtsNetTestCasesLatestSdk
Original-Change: https://android-review.googlesource.com/1719017
Merged-In: I3272c825b86ec30c3d0bf4097088c653e668461b
Change-Id: I3272c825b86ec30c3d0bf4097088c653e668461b
2021-06-22 09:24:37 +00:00
Lucas Lin
77cb456671
Add CTS for isUidNetworkingBlocked & isUidRestrictedOnMeteredNetworks
...
BYPASS_INCLUSIVE_LANGUAGE_REASON=To make the change more clear,
fix the inclusive problem in a follow-up commit.
Bug: 176289731
Test: atest CtsHostsideNetworkTests:HostsideNetworkPolicyManagerTests
Original-Change: https://android-review.googlesource.com/1737395
Merged-In: Ie6bda8570979b10a28dbeb20f6db7a9c44735964
Change-Id: Ie6bda8570979b10a28dbeb20f6db7a9c44735964
2021-06-22 09:24:30 +00:00
Paul Hu
e4a2abad44
Add test for CSM#[get|set]MobileDataPreferredUids
...
Bug: 171872461
Test: atest ConnectivityManagerTest
Original-Change: https://android-review.googlesource.com/1736504
Merged-In: I43dfb049c271602526fa3e89ebb91219c7785a21
Change-Id: I43dfb049c271602526fa3e89ebb91219c7785a21
2021-06-22 09:24:24 +00:00
Treehugger Robot
34c8be9ac7
Add test for setHttpProxyConfiguration
...
The test verifies that system properties are set as expected by the
method.
Bug: 174436414
Test: atest ProxyTest
Original-Change: https://android-review.googlesource.com/1564956
Merged-In: Id15909c5e52f1042d7210cf7e416874bb01baee7
Change-Id: Id15909c5e52f1042d7210cf7e416874bb01baee7
2021-06-22 09:24:19 +00:00
Aaron Huang
1eb05790a2
CTS test for PacProxyManager
...
Bug: 181745786
Test: build CtsNetTestCases pass
CtsNetTestCases:PacProxyManagerTest
CtsNetTestCases:CaptivePortalTest
Original-Change: https://android-review.googlesource.com/1705131
Merged-In: I88cf3ecac12f4e8726d95a9b051e83eb719b0702
Change-Id: I88cf3ecac12f4e8726d95a9b051e83eb719b0702
2021-06-22 09:24:13 +00:00
Chiachang Wang
1981466747
Add test for CM#setAcceptUnvalidated
...
The always bit is verified in NetworkAgentTest. There is no easy
configuration to set an explicitly selected network to accept an
unvalidated network. Verify the accepted case also in
NetworkAgentTest.
Bug: 186061922
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCasesLatestSdk
Original-Change: https://android-review.googlesource.com/1731234
Merged-In: I803eb975fb0b6c52d55b2310293bcad407d21f42
Change-Id: I803eb975fb0b6c52d55b2310293bcad407d21f42
2021-06-22 09:24:07 +00:00