Commit Graph

5401 Commits

Author SHA1 Message Date
Bill Yi
27c07910ff Merge mainline-release 6664920 to master - DO NOT MERGE
Merged-In: I583836eeeaf604391ed9b1196d4b41e872dc635d
Change-Id: Ifd90a94f57f27c2477c0bc52efaea91870080501
2020-09-17 21:56:56 -07:00
Xin Li
1684245304 Mark RP1A.200720.001 as merged
Bug: 167588565
Merged-In: I787906cd0776c1a335b44755b6c162df29de173c
Change-Id: Ie267fa877d7e455352cc505dc7aba0d5b531a9a3
2020-09-02 11:44:50 -07:00
Xin Li
77065af37d Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master 2020-09-01 20:03:43 +00:00
Treehugger Robot
b974f51473 Merge "Don't require WiFi in CtsHostsideNetworkTests." 2020-09-01 09:15:35 +00:00
Treehugger Robot
74bfd2d74c Merge "Specify CAPABILITY_INTERNET for ConnDiags CTS test." 2020-09-01 06:11:22 +00:00
Tse Ho Lin
243c42a9b9 Don't require WiFi in CtsHostsideNetworkTests.
Skip test for non-WiFi connections.

Bug: 162192335
Test: run cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideNetworkCallbackTests#testOnBlockedStatusChanged_dataSaver
Change-Id: I7c20e3454a2fe81671162e0a50f90d64ed7516d0
2020-09-01 05:20:44 +00:00
Cody Kesting
cb00911ada Specify CAPABILITY_INTERNET for ConnDiags CTS test.
This CL updates the NetworkCapabilities used for getting a cellular
data network in ConnectivityDiagnosticsManagerTest to require
CAPABILITY_INTERNET.

Bug: 166732795
Test: atest CtsNetTestCases
Change-Id: Ia32ac00f949a2ee9319c80c25f294bfa834ad0f9
2020-08-31 11:00:26 -07:00
Xin Li
9d04ab0a42 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: Id9ba142af9d2da12bda66d0c376d4b8c13f1503b
Change-Id: I1a1bdaabd06f43b695ac94172a6f46d00b7f5b84
2020-08-29 01:22:07 -07:00
Treehugger Robot
d863e35484 Merge "Add working internet precondition check" 2020-08-27 11:12:35 +00:00
Chiachang Wang
48d952a502 Add working internet precondition check
ConnectivityManagerTest expects a working internet before testing
but is not verified before each test. Add a working internet
check in setup to clearly test it.

Bug: 161370134
Test: atest CtsNetTestCasesLatestSdk:ConnectivityManagerTest
Change-Id: I47073ebff19fcf59d5d2ac86b43f8d54e621a55a
2020-08-27 17:58:48 +08:00
Treehugger Robot
5e759307ff Merge "Run validation tests even with an eth interface" am: 856ad3bc23
Original change: https://android-review.googlesource.com/c/platform/cts/+/1400131

Change-Id: I9c072749777457d4930535cde79d994f6717f48f
2020-08-24 10:51:39 +00:00
Remi NGUYEN VAN
fe093f509b Merge "Add utilities for network validation testing" am: ff15197c34
Original change: https://android-review.googlesource.com/c/platform/cts/+/1364518

Change-Id: Ia6f360509892910706d5f92aa98a9243feb9fd98
2020-08-24 07:41:30 +00:00
Remi NGUYEN VAN
c47fa617f2 Run validation tests even with an eth interface
The test actually does not need the ethernet interface to be the
only ethernet interface, as ethernet test interfaces now have
TRANSPORT_TEST|TRANSPORT_ETHERNET, which can be used to differentiate
them in the network request.

Bug: 162469293
Test: atest CtsNetTestCasesLatestSdk:NetworkValidationTest
Change-Id: I84cc8b6b9aaa764705d91ed298655d869c4388a6
2020-08-21 19:17:09 +09:00
Remi NGUYEN VAN
0e9b130cbc Add utilities for network validation testing
Refactor out TestHttpServer to share it between CaptivePortalApiTest and
CaptivePortalTest, move it to frameworks/libs/net, and add a
NetworkValidationTestUtil class with utilities to set the test
validation URLs.

Test: atest CtsNetTestCasesLatestSdk:CaptivePortal[Api]Test
Bug: 160617623
Bug: 160656765
Change-Id: Icd7829e680b2dddd1ddaa3dc2d946c14c20b5a15
2020-08-21 19:17:03 +09:00
Treehugger Robot
2d1446b55a Merge "Add a dependency test for getFrequency" am: 7b965d116d
Original change: https://android-review.googlesource.com/c/platform/cts/+/1398411

Change-Id: Icf8f6f4c61fb435137649ccf3f4bd91224707ea7
2020-08-14 04:21:49 +00:00
Treehugger Robot
7b965d116d Merge "Add a dependency test for getFrequency" 2020-08-14 04:02:54 +00:00
Remi NGUYEN VAN
1cf2445443 Add a dependency test for getFrequency
WifiInfo#getFrequency is tested in CTS since R, but because it is used
on Q devices in the NetworkStack, it should be covered by MTS.
Because wifi should be connected to run this test, CTS is the best place
to add a test.

Bug: 160006669
Test: atest NetworkStackDependenciesTest
Change-Id: I0040c2a163ef5e1a3b725d5aedc67259d01ca173
2020-08-13 15:19:27 +09:00
Chalard Jean
f0adb99511 Merge "Rename Kotlin util files to not include the Kt suffix" am: a42b415dc9
Original change: https://android-review.googlesource.com/c/platform/cts/+/1353402

Change-Id: Ib895f34ce8580dbd8daf941243a1a3724bb10582
2020-08-13 04:09:27 +00:00
Chalard Jean
7356e73849 Rename Kotlin util files to not include the Kt suffix
Callers don't care what language the utilities are written in

Test: builds
Change-Id: I06bf9838432e429b3d03649654e1bcef04b89dd9
2020-07-31 17:22:49 +09:00
Chalard Jean
77fd539623 Merge "Move some utils to a more appropriate package/directory" am: 6bf9a90a55
Original change: https://android-review.googlesource.com/c/platform/cts/+/1351363

Change-Id: I36c4831a5b8befd37d0a2802ac76680e42e03eeb
2020-07-31 00:53:12 +00:00
Chalard Jean
6bf9a90a55 Merge "Move some utils to a more appropriate package/directory" 2020-07-31 00:44:46 +00:00
Sudheer Shanka
65a484cb31 Merge "Update language to comply with Android’s inclusive language guidance." am: d0f158204f
Original change: https://android-review.googlesource.com/c/platform/cts/+/1377699

Change-Id: Ib144461d9ec7a39d8cba1e321d5a14ef698d972e
2020-07-30 21:26:25 +00:00
Sudheer Shanka
d0f158204f Merge "Update language to comply with Android’s inclusive language guidance." 2020-07-30 21:19:38 +00:00
Sudheer Shanka
2d4d72bc31 Update language to comply with Android’s inclusive language guidance.
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: n/a
Change-Id: I466bcd05d1cb5a5ba271bd4a7513c0e7dfa5145c
2020-07-29 20:09:33 +00:00
Chalard Jean
71b829649f Move some utils to a more appropriate package/directory
Test: builds
Change-Id: Id0f0f89c34502deb6d0e50503e5534fcc51c3f9b
2020-07-29 21:15:43 +09:00
Chiachang Wang
156ea0167e Merge "Update language to comply with Android's inclusive language guidance" am: 577c469d6b
Original change: https://android-review.googlesource.com/c/platform/cts/+/1373261

Change-Id: I7eafc5c7a63052351ad1d1b437cdd9df327dce15
2020-07-29 06:04:57 +00:00
Chiachang Wang
577c469d6b Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 05:44:57 +00:00
Chiachang Wang
59201b8e94 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code
for reference.

Test: atest CtsNetTestCasesLatestSdk:ConnectivityManagerTest
Bug: 161896447
Change-Id: I0c4be6060c66c75518629239703755c3fc5d99be
2020-07-29 11:58:48 +08:00
android-build-team Robot
466cc12347 Snap for 6690197 from 2008be86fd to rvc-release
Change-Id: If3d7cb32e6cba792a1632f423694fabca8543dbe
2020-07-18 01:02:14 +00:00
Sudheer Shanka
0a0d161fb3 Merge "Force the app idle state again after whitelisting it." into rvc-dev am: 2008be86fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12171299

Change-Id: Ifc7ac3392d0edcdc870b0ab72863a087dcf0b440
2020-07-17 22:56:01 +00:00
Sudheer Shanka
2008be86fd Merge "Force the app idle state again after whitelisting it." into rvc-dev 2020-07-17 22:48:44 +00:00
android-build-team Robot
df678100ba Snap for 6687127 from d86b80fc72c30a835387fa34ffc1ff3f6cd766cc to rvc-release
Change-Id: Ib79e62a413600173542552bf468cd5f8a7946149
2020-07-17 01:16:37 +00:00
Sudheer Shanka
7c4bb75e1b Force the app idle state again after whitelisting it.
Whitelisting the app resets forced idle state of an app, so
forcing idle state again.

Bug: 161477606
Test: atest ./hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Change-Id: Ib57202a68071cc02d6071e0dc2c4780f026ad90b
2020-07-16 14:00:27 -07:00
Remi NGUYEN VAN
4e553a8d27 Merge "Auto-configure wifi on virtual devices" into rvc-dev am: bd340d8912
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11734678

Change-Id: I3fd084a6416a6902fb443a7696ba3a2064380b47
2020-07-16 13:40:29 +00:00
Remi NGUYEN VAN
bd340d8912 Merge "Auto-configure wifi on virtual devices" into rvc-dev 2020-07-16 13:25:51 +00:00
Chalard Jean
78c341cad0 Merge "Add ConnectivityManagerTest#testSetAirplaneMode" am: 7efcd4be05 am: 542057b81d
Original change: https://android-review.googlesource.com/c/platform/cts/+/1178309

Change-Id: I81cf7ccafbf4a0c751d7fd7915e54396aa3abf63
2020-07-16 12:04:02 +00:00
Chalard Jean
542057b81d Merge "Add ConnectivityManagerTest#testSetAirplaneMode" am: 7efcd4be05
Original change: https://android-review.googlesource.com/c/platform/cts/+/1178309

Change-Id: I5efb53fbd682c183b615e32ef73b7a3bb194ef94
2020-07-16 11:50:43 +00:00
TreeHugger Robot
5038b7000b [automerger skipped] Merge "Add CtsNetTestCasesLatestSdk to mainline-presubmit" into rvc-dev am: 47b8426932 -s ours
am skip reason: Change-Id I8704cc5626a3e049eb3c27adb86e9c1a4d828273 with SHA-1 a1b13d6d39 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12121965

Change-Id: I8f8253ab1acb54a3d1690eef84e36af8d1f4f6fe
2020-07-16 03:01:39 +00:00
TreeHugger Robot
47b8426932 Merge "Add CtsNetTestCasesLatestSdk to mainline-presubmit" into rvc-dev 2020-07-16 02:48:20 +00:00
Remi NGUYEN VAN
10980d136c Auto-configure wifi on virtual devices
At the moment tests run on virtual devices through TEST_MAPPING do not
necessarily have wifi configured to auto-connect to a test SSID.

This could be fixed by adding a TargetPreparer in AndroidTest.xml with a
given SSID, but that configuration would then apply to all runs,
including local ones. There is also no good way to apply a preparer that
configures wifi "if it is not already connected": WifiPreparer in
particular will not configure wifi even if just a mobile network is
active.

Implement auto-configuration in CtsNetUtils#connectToWifi so that if no
network is configured, and a virtual SSID is detected when scanning,
that SSID will be added to the list of configured networks. This allows
addressing the issue until TEST_MAPPING can support configuring wifi,
with minimal side-effects on other runs.

Test: atest CtsNetTestCasesLatestSdk:CaptivePortalTest
Bug: 158153057
Change-Id: I47df4c325b073f8a9bf320894245eed211606952
2020-07-16 10:07:37 +09:00
Edward Savage-Jones
241a767522 Add ConnectivityManagerTest#testSetAirplaneMode
Add a test to verify the NETWORK_AIRPLANE_MODE permission

Bug: 145164696
Test: atest android.net.cts.ConnectivityManagerTest#testSetAirplaneMode
Change-Id: I45c024f444988ec0c43d60778a1d9c9fd3acbdb5
2020-07-14 14:06:52 +00:00
android-build-team Robot
b83151727c Snap for 6676900 from 3100b16907360af0618e7303563503c881dc7b84 to rvc-release
Change-Id: I3504eafb0df01623a096b442d460f12f4646cb33
2020-07-14 01:07:47 +00:00
TreeHugger Robot
e477716822 [automerger skipped] Merge "Don't run testRequestLatestEntitlementResult if not supported" into rvc-dev am: 79b592dd26 -s ours
am skip reason: Change-Id I65c32d5bc26f18f8c9d91593ab0c178e69e75c39 with SHA-1 b589520368 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12125016

Change-Id: Id3d5cb00c9aef291a9d342efa763516e29dffbd4
2020-07-13 16:19:30 +00:00
TreeHugger Robot
79b592dd26 Merge "Don't run testRequestLatestEntitlementResult if not supported" into rvc-dev 2020-07-13 16:04:39 +00:00
Chalard Jean
e985f78ec8 [automerger skipped] Merge "Ignore non-matching callbacks to fix flakiness" into rvc-dev am: 7117a52f6e -s ours
am skip reason: Change-Id I67c685ebfb2c5e2ee6f7615196eedea8292ca3ff with SHA-1 f70d762a55 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12121966

Change-Id: I977c3ca3ba8d4fc76004e4ec68ad780e3cdd2e07
2020-07-13 08:24:27 +00:00
Mark Chien
1e19cd613f Don't run testRequestLatestEntitlementResult if not supported
If tethering is not supported, skip testRequestLatestEntitlementResult
which test TetheringManager#requestLatestTetheringEntitlementResult
API.

Bug: 159869957
Test: atest CtsTetheringTest
Merged-In: I65c32d5bc26f18f8c9d91593ab0c178e69e75c39
Change-Id: I65c32d5bc26f18f8c9d91593ab0c178e69e75c39
2020-07-13 02:52:45 +00:00
Mark Chien
cf750de87c Merge "Don't run testRequestLatestEntitlementResult if not supported" am: 1129c316fd am: 793308371d
Original change: https://android-review.googlesource.com/c/platform/cts/+/1352284

Change-Id: I46d2d005d1a26c45f36cb387faa079a09ce708e4
2020-07-13 02:30:59 +00:00
Treehugger Robot
0a5ad58f9c Merge "Add CtsNetTestCasesLatestSdk to mainline-presubmit" am: ce5d7c09ab am: 8d12e31a62
Original change: https://android-review.googlesource.com/c/platform/cts/+/1331100

Change-Id: I167e3cd462e8ab0798c28b6b76c085f1a464cebb
2020-07-13 02:30:38 +00:00
android-build-team Robot
347e21366d Snap for 6671561 from e27c2d254440b4d75c87ef4947553eadf7151922 to rvc-release
Change-Id: I9ad92d4c733a3e63b8d77f820dffc5bebf8a5ada
2020-07-11 01:07:37 +00:00
Mark Chien
793308371d Merge "Don't run testRequestLatestEntitlementResult if not supported" am: 1129c316fd
Original change: https://android-review.googlesource.com/c/platform/cts/+/1352284

Change-Id: I2c0704ada44b23b511353cab8a52a396de52d692
2020-07-10 07:09:53 +00:00