Commit Graph

2322 Commits

Author SHA1 Message Date
Treehugger Robot
acf3792680 Merge "Temporarily disable flaky testRequestBackgroundNetwork CTS test" am: 1259762383 am: 81d26e80ed am: 189842e956
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1579874

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41eaa4e3d419298b70c8e17b01043342f7ac0769
2021-02-09 03:18:46 +00:00
Treehugger Robot
1259762383 Merge "Temporarily disable flaky testRequestBackgroundNetwork CTS test" 2021-02-09 00:13:46 +00:00
Junyu Lai
eae05b4583 Merge changes from topic "vcn07" am: 438f787ca3 am: dfb0a4ffc0 am: 8d02b4ad8c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1579872

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8cabe55144533c15be90895d416b129eb3c9c75
2021-02-08 22:37:06 +00:00
Junyu Lai
438f787ca3 Merge changes from topic "vcn07"
* changes:
  Address comments on aosp/1550755
  [VCN07.1] Add test for bypassing VCN for non-internet request
2021-02-08 21:40:09 +00:00
junyulai
349deb8e15 Temporarily disable flaky testRequestBackgroundNetwork CTS test
Test: TH
Bug: 179554972
Change-Id: If82d561231b74e8cd0d220431ac83d08e8f16cdd
2021-02-08 21:48:13 +08:00
junyulai
5ceb5c3c8f Address comments on aosp/1550755
This CL bypass adding NOT_VCN_MANAGED on R device. And add TODOs
for refactoring and adding test coverage.

Test: atest CtsNetTestCasesLatestSdk:NetworkRequestTest on R device
Bug: 175662146

Change-Id: Id09b19c13f9a74e25d45689d2211418172dfaec8
2021-02-08 08:52:28 +00:00
Sudheer Shanka
8247993e00 Update meteredness of cellular networks for tests.
This would allow us to run both metered and unmetered networkpolicy
related tests when the device is on a cellular network.

Bug: 165343126
Test: atest CtsHostsideNetworkTests:HostsideRestrictBackgroundNetworkTests
Test: atest CtsHostsideNetworkTests:HostsideNetworkCallbackTests
Change-Id: Id70856dffc920e74bda28583dba4dd851a832397
Merged-In: Id70856dffc920e74bda28583dba4dd851a832397
2021-02-07 23:29:08 +00:00
Sudheer Shanka
48cf7f07a4 Merge "Update meteredness of cellular networks for tests." into sc-dev 2021-02-07 19:08:50 +00:00
Sudheer Shanka
9e441af03a Update meteredness of cellular networks for tests.
This would allow us to run both metered and unmetered networkpolicy
related tests when the device is on a cellular network.

Bug: 165343126
Test: atest CtsHostsideNetworkTests:HostsideRestrictBackgroundNetworkTests
Test: atest CtsHostsideNetworkTests:HostsideNetworkCallbackTests
Ignore-AOSP-First: Handling merge-conflict
Change-Id: Id70856dffc920e74bda28583dba4dd851a832397
2021-02-05 07:11:23 +00:00
junyulai
ea79aa6fd9 [VCN07.1] Add test for bypassing VCN for non-internet request
Test: atest NetworkRequestTest#testBypassingVcnForNonInternetRequest
Bug: 175662146
Change-Id: I245bd69e02866d3608ab1667b665f6e12860037b
2021-02-05 10:09:09 +08:00
Junyu Lai
e2ab8d52f3 Merge "[VCN06.1] Add CTS for request background network" am: fa8d845a6e am: abae927467 am: 0519dd2437
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1553867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4fc62fc58d55f3151bd18a646b34f5041a2354b
2021-01-29 23:36:41 +00:00
Junyu Lai
38b5855ff7 [VCN06.1] Add CTS for request background network
Test: android.net.cts.ConnectivityManagerTest#testRequestBackgroundNetwork
Bug: 175662146

Change-Id: Icd7d2bc18c4b328291e96fc3f18828d0421f5b6e
2021-01-29 14:34:38 +08:00
Sudheer Shanka
f0ba6291b1 Check and skip certain operations if they are unsupported.
Fixes: 178334463
Test: com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testMeteredNetworkAccess_expeditedJob
Ignore-AOSP-First: Expedited jobs are not available in AOSP yet
Change-Id: Ie68e17063454e7feeffc93b20b1b8fbb276e837f
2021-01-27 23:18:18 +00:00
Sudheer Shanka
b8e550e8be Update test to include FLAG_MUTABLE when creating a PendingIntent.
Fixes: 178077028
Test: atest com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testDozeModeNonMetered_enabledButWhitelistedOnNotificationAction
Ignore-AOSP-First: FLAG_MUTABLE is not available in aosp
Change-Id: I91013ffe375fb7befc58134a571ea9ab37c3affa
2021-01-22 23:12:48 +00:00
Sudheer Shanka
bfe1df5143 Restructure expedited jobs related networkpolicy tests.
This would make it easy to add these tests to JobScheduler
related TEST_MAPPINGs.

Test: atest src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Ignore-AOSP-First: Expedited jobs are not available in AOSP yet
Change-Id: I4132c3b694515a23ff41aa413b48d6251f5b685e
2021-01-20 22:15:27 -08:00
Sudheer Shanka
51691d6ab7 Add tests to verify that Expedited jobs have network access.
Bug: 177641226
Test: atest CtsHostsideNetworkTests:HostsideRestrictBackgroundNetworkTest
Ignore-AOSP-First: Expedited jobs are not available in AOSP yet
Change-Id: Idc0762093667d49f09d52050c47c29cbc55997e1
2021-01-19 12:16:14 -08:00
Junyu Lai
f555f4bca7 Merge "Revert "[VCN06.1] Add CTS for request background network"" 2021-01-19 10:24:47 +00:00
Junyu Lai
3660b71c11 Revert "[VCN06.1] Add CTS for request background network"
Revert "[VCN06] Support request background network"

Revert submission 1545847-vcn06

Reason for revert: b/177876289 presubmit failure
Reverted Changes:
I8042ce197:[VCN06.1] Add CTS for request background network
If9aaa87b7:[VCN06] Support request background network

Change-Id: Icd01643cae86c4448eb7105ef0f238b1f10ebc19
2021-01-19 09:06:00 +00:00
Junyu Lai
5b39b66544 Merge "[VCN06.1] Add CTS for request background network" 2021-01-19 01:04:20 +00:00
junyulai
f8370c08be [VCN06.1] Add CTS for request background network
Test: android.net.cts.ConnectivityManagerTest#testRequestBackgroundNetwork
Bug: 175662146
Change-Id: I8042ce1971c728a9f900d090c0c4cabd994820bf
2021-01-18 16:32:33 +08:00
Remi NGUYEN VAN
1acf96eb96 Skip NetworkAgentTest on R- am: 4bf203d065 am: 6bc4e3c9db am: 3dec2a082d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552215

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib28303a626d3f4bea9aa1431d6c2d553d85f27a2
2021-01-15 10:18:57 +00:00
Remi NGUYEN VAN
4bf203d065 Skip NetworkAgentTest on R-
NetworkAgent is not updatable on R-, so there is no need to run tests
compiled against S on older platforms. They are also incompatible
because NetworkAgent stopped using AsyncChannel in S.

This only affects MTS, and CTS used to test S+ devices. CTS for R-
devices is already cut in a branch that this change will not merge to.

Bug: 177290955
Change-Id: I85c137a1b5fd7ef701fba4623566df5a8fb707a3
Test: atest CtsNetTestCasesLatestSdk
2021-01-15 07:45:29 +00:00
Treehugger Robot
0b421a4b94 Merge "Net CTS: move NsdManagerTest from Wifi CTS" am: 26b0cf3261 am: d0516927eb am: abd7330b9f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1548094

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7bd154f46673d052b051fc99643c92cb1645d79b
2021-01-14 05:45:19 +00:00
Treehugger Robot
26b0cf3261 Merge "Net CTS: move NsdManagerTest from Wifi CTS" 2021-01-14 03:51:17 +00:00
David Su
cd1851e0a2 Net CTS: move NsdManagerTest from Wifi CTS
NsdManagerTest is not owned by Wifi, so it doesn't
belong in Wifi CTS.

Bug: 176902925
Test: atest CtsNetTestCases
Change-Id: I8eb3cba7a3b2ff24a012cca8d3fdff173e88c69a
2021-01-14 03:47:25 +00:00
Remi NGUYEN VAN
3e6232f97f Merge "Do not install tethering in TEST_MAPPING" 2021-01-13 12:34:48 +00:00
Remi NGUYEN VAN
c2858740c1 Do not install tethering in TEST_MAPPING
The current tethering module has in-progress changes in non-mainline
branches, so it cannot be installed.
Disable the tests in non-mainline branches, considering that they are
still run in mainline branches, which will contain the same tethering
code, but without the connectivity artifacts added to the tethering
apex.

Bug: 177290955
Test: TEST_MAPPING needs to be tested on the infra
Ignore-AOSP-First: This change must not go into AOSP
Change-Id: I39dd011a8baa16c9b8eb33ec2a2e4dcaedf25b76
2021-01-13 17:13:12 +09:00
Patrick Rohr
5e5837d969 Merge "Add CTS test for Restricted Networking Mode" am: 99f6c312ef am: cf8096729f am: 137b0929c8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1545724

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If63b8475d1353a4309baad19488b8ee1a9ec54ad
2021-01-12 21:03:41 +00:00
Patrick Rohr
4df8a7aef1 Add CTS test for Restricted Networking Mode
Test: atest com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Bug: 175281879
Bug: 170323671
Change-Id: Ic69e7e029debeea1f131242fb2baad2796d4768c
2021-01-11 09:47:04 +01:00
Sudheer Shanka
8cee9bf1fc Merge "Increase the wait timeout for meteredness to change." am: edb6669cf1 am: eccfb47e5b am: da74e5086d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1538985

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91e7df1632d46161a7821c6691fb9893ef53a79f
2021-01-07 23:49:48 +00:00
Sudheer Shanka
edb6669cf1 Merge "Increase the wait timeout for meteredness to change." 2021-01-07 22:56:48 +00:00
Sudheer Shanka
796f29c09e Increase the wait timeout for meteredness to change.
Bug: 170241174
Bug: 174808291
Test: atest CtsHostsideNetworkTests:HostsideRestrictBackgroundNetworkTests
Change-Id: I3af17819a403958d88a30af7f6346e5bb96b2828
2021-01-05 06:37:56 +00:00
Chalard Jean
4f896db6ff Migrate away from AsyncChannel in NetworkAgent
Use two oneway binder interfaces instead.
The interfaces post messages to handlers as was implemented before, but
provide a more strictly defined interface, with less hops between
NetworkAgent, AsyncChannel, and ConnectivityService.

Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Merged-In: Ica51d0179bcb3b4e314d2c3e85709aead6ca5657

Change-Id: Ica51d0179bcb3b4e314d2c3e85709aead6ca5657
2020-12-25 11:11:32 +09:00
Chalard Jean
afe26600fb Migrate away from AsyncChannel in NetworkAgent
Use two oneway binder interfaces instead.
The interfaces post messages to handlers as was implemented before, but
provide a more strictly defined interface, with less hops between
NetworkAgent, AsyncChannel, and ConnectivityService.

Exempt-From-Owner-Approval: Owners OOO, change approved by team members
Ignore-AOSP-First: merge conflicts in dependent changes
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Change-Id: Ica51d0179bcb3b4e314d2c3e85709aead6ca5657
2020-12-25 01:52:53 +00:00
Remi NGUYEN VAN
7ecf53ec21 Fix timeout on NetworkAgentTest callback am: abb46bef36 am: 44cc38ce67 am: bc1e892463
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1530739

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb92470433df1f096261968d9d10a1e314ab705b
2020-12-21 05:46:55 +00:00
Remi NGUYEN VAN
abb46bef36 Fix timeout on NetworkAgentTest callback
All callbacks in the class use the DEFAULT_TIMEOUT_MS, except for this recently
added test.

The test is currently flaky in various branches.
Fixes: 174716714
Fixes: 174691729
Change-Id: I9f4446bb83eb4402c912292ac31d46e1d2cb6a52
Test: TH
2020-12-16 06:29:20 +00:00
Remi NGUYEN VAN
6a2a355206 Move cts/net/TEST_MAPPING to toplevel am: 9b6b353b5d am: 69963e8600 am: d2c83f152a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1529961

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2778ead9d69a36d7e3b23be98e18b318f00f40b7
2020-12-16 03:20:33 +00:00
Remi NGUYEN VAN
9b6b353b5d Move cts/net/TEST_MAPPING to toplevel
The tests should just be run on any change in packages/modules/Connectivity,
not just changes in the CTS package.

Change-Id: I1c86c402f39a8a9b84e7422445df289c3ea7842f
Test: TEST_MAPPING needs to be verified by TH
2020-12-15 09:39:58 +00:00
Lorenzo Colitti
d57fcbe873 Merge changes from topic "cs-generalize-underlying-networks" am: 678d27faca am: 7c822d82b7 am: 2ed0825b76
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1526361

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibaab9f8b09cecb9bea9dcbad14d54939d3829628
2020-12-14 06:40:27 +00:00
Lorenzo Colitti
678d27faca Merge changes from topic "cs-generalize-underlying-networks"
* changes:
  Update NetworkAgentTest to support generalized underlying networks.
  Minor fixes to NetworkAgentTest.
2020-12-14 05:19:49 +00:00
Lorenzo Colitti
ed1211d2d8 Update NetworkAgentTest to support generalized underlying networks.
Currently, when an agent calls setUnderlyingNetworks, the
transports of the network are hardcoded to TRANSPORT_VPN only.
This is being fixed in another CL in this topic. The new code
reports the same transports sent by the agent.

This test registers an agent with TRANSPORT_TEST|TRANSPORT_VPN.
Update the test to expect both transports in the callbacks it
receives.

Bug: 173331190
Test: passes when run with other CL in topic
Change-Id: Iede61d74fa02a4fec1f345f6d18835c1acab7337
2020-12-12 22:57:06 +09:00
Lorenzo Colitti
cc3e994f16 Minor fixes to NetworkAgentTest.
- Use a more realistic routing config (instead of a LinkAddress
  with prefix length 0, an address with a mask of 32 and a
  default route).
- Use InetAddresses to parse IP addresses since it's a public API.
- Import the NET_CAPABILITY_xxx and TRANSPORT_xxx constants for
  readability.

Bug: 173331190
Test: test-only change
Change-Id: I9703d7dd5781f60fb3d531267d3f5370cbccd64f
2020-12-12 22:57:05 +09:00
Lorenzo Colitti
becc4502e2 Merge "Pass in proper NetworkCapabilities in testSetUnderlyingNetworks." am: 78f7c04770 am: 06513c4cd2 am: bdd3d7477a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1518566

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6ff7d4a93529d6dfee4271c429aa837f6ebca78
2020-12-09 03:05:38 +00:00
Lorenzo Colitti
78f7c04770 Merge "Pass in proper NetworkCapabilities in testSetUnderlyingNetworks." 2020-12-09 00:11:23 +00:00
Lorenzo Colitti
977464ef5a Pass in proper NetworkCapabilities in testSetUnderlyingNetworks.
The CL that introduced testSetUnderlyingNetworks allowed tests to
pass in NetworkCapabilities when registering an agent, but
incorrectly always set the agent's capabilities anyway. This
resulted in testSetUnderlyingNetworks registering an agent with
TRANSPORT_VPN and NET_CAPABILITY_NOT_VPN.

Fix this by ensuring that createNetworkAgent either uses the
passed-in capabilities unmodified, or creates its own. Assert
that the test VPN network does not have NET_CAPABILITY_NOT_VPN.

While I'm at it, remove the manual unregistration of the callback
by using the registerNetworkCallback helper method.

Also add a little bit of extra test coverage.

Bug: 173331190
Test: test-only change
Change-Id: I114d876a1b2bf5344dd7c6fa23862df1c0a412c3
2020-12-08 01:15:32 +09:00
Remi NGUYEN VAN
f3bc8c4b6d Set noparent in connectivity CTS owners am: d01761e07f am: 7fc54e7294 am: 80c934b7fe
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1516266

Change-Id: I287c02192a32b87b9100ece72259e1a65bb04b8a
2020-12-03 11:50:21 +00:00
Remi NGUYEN VAN
d01761e07f Set noparent in connectivity CTS owners
Also reorganize the files to have one toplevel CTS owners file, and only
additional owners in subdirectories.

Change-Id: I28ce193896e1ade2034589327805870774a4d608
Test: m
2020-12-03 08:07:32 +00:00
Lorenzo Colitti
5016423e6d Merge "Add a CTS test for NetworkAgent#setUnderlyingNetworks." am: 7d04b2a26c am: 6bd26a9f30 am: b8a7b65506
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1511114

Change-Id: Ie06c01450106f7b8bb4fd247a372420074326954
2020-11-28 04:50:46 +00:00
Lorenzo Colitti
7d04b2a26c Merge "Add a CTS test for NetworkAgent#setUnderlyingNetworks." 2020-11-28 02:49:53 +00:00
Treehugger Robot
d9f603eebf Merge "Fix race condition in NetworkWatchListTest" am: de39ae42ac am: 59ecc20061 am: 14991f2507
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1511070

Change-Id: I0f6639d68c486ff556ee28b65476cfab2cf61fd6
2020-11-27 11:40:56 +00:00