Commit Graph

1441 Commits

Author SHA1 Message Date
Automerger Merge Worker
311b4e40df Merge "Fix Error Prone errors" am: 72acd372b2 am: bbf2f80c02
Change-Id: If25e24771a7ec33681e2cc3c0ca210351e66deab
2019-12-20 21:19:35 +00:00
Colin Cross
72acd372b2 Merge "Fix Error Prone errors" 2019-12-20 21:02:06 +00:00
Automerger Merge Worker
cfd433d999 Merge "Add cts for MacAddress public API" am: 0f364ba113 am: d35360b193
Change-Id: I4f3f11fa123099ff464a77d06a0b768c47c8302f
2019-12-19 08:22:29 +00:00
Aaron Huang
0f364ba113 Merge "Add cts for MacAddress public API" 2019-12-19 08:02:20 +00:00
Colin Cross
284371356c Fix Error Prone errors
Soong wasn't including android_app or android_test sources in the
javac-check target used for the Error Prone build, which allowed
some Error Prone errors to get in.  Fix them so Error Prone can be
re-enabled for these targets.

Fixes:
cts/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/LockTaskHostDrivenTest.java:50: error: [JUnitAmbiguousTestClass] Test class inherits from JUnit 3's TestCase but has JUnit 4 @Test annotations.
cts/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/LockTaskTest.java:51: error: [JUnitAmbiguousTestClass] Test class inherits from JUnit 3's TestCase but has JUnit 4 @Test annotations.
cts/tests/tests/telephony/current/src/android/telephony/cts/CarrierServiceTest.java:34: error: [JUnitAmbiguousTestClass] Test class inherits from JUnit 3's TestCase but has JUnit 4 @Test annotations.
cts/tests/tests/tethering/src/android/tethering/cts/TetheringManagerTest.java:166: error: [ArrayToString] Calling toString on an array does not provide useful information
cts/tests/tests/tethering/src/android/tethering/cts/TetheringManagerTest.java:172: error: [ArrayToString] Calling toString on an array does not provide useful information

Bug: 146455923
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: I949e409fd7ba80ab8937db1c08eaaaf9608b17ed
2019-12-18 14:08:48 -08:00
Automerger Merge Worker
f0d974fcb8 Merge "Add mts tag to the build file for MTS testing" am: fd1f875e39 am: c0eaab2bd8
Change-Id: I79bbfb7858d7928b40702691a5fb5f2673f986ba
2019-12-18 10:16:17 +00:00
markchien
9ccf3d87fb Add mts tag to the build file for MTS testing
Bug: 145490751
Test: build, atest CtsTetheringTest
Change-Id: I993ce5ec89ab98de7eadaf6624a30a37851ca716
2019-12-18 11:55:32 +08:00
Automerger Merge Worker
84b44168a3 Merge "Create new CTS test for tethering" am: b376f283cb am: 235a625d30
Change-Id: I5019dd909344341dd861e8c0c3dd75e6e4d61799
2019-12-17 15:23:19 +00:00
markchien
fb904c36de Create new CTS test for tethering
Initial CTS test for tethering.
This change test startTethering/stopTethering and check
status of TETHER_STATE_CHANGE intent.

Bug: 145490751
Test: atest CtsTetheringTest
Change-Id: Ia1ae3b6c2b68b009ca4deef840945186d472d99e
2019-12-16 19:53:15 +08:00
Aaron Huang
593054729c Add cts for MacAddress public API
Add test for new public APIs

Test: atest android.net.cts.MacAddressTest
Bug: 139268426
Bug: 135998869
Change-Id: Ib2b73851f621f1648904276ec12ceea02f4b5970
2019-12-16 17:11:34 +08:00
Automerger Merge Worker
b29ba93dcd Merge "Add a CTS test for private DNS on VPNs." into qt-dev am: 17311d9af6 am: fe44dd21ba am: 523cc30322
Change-Id: If38d0c7e8b878e76ff4a52fcdd441b002ce9ddf0
2019-12-13 01:41:48 +00:00
Automerger Merge Worker
fe44dd21ba Merge "Add a CTS test for private DNS on VPNs." into qt-dev am: 17311d9af6
Change-Id: I31b248ede81bc423d91ba747cc6a8275a4be4f81
2019-12-13 01:05:22 +00:00
Lorenzo Colitti
3b160e2385 Add a CTS test for private DNS on VPNs.
Bug: 122652057
Test: atest com.android.cts.net.HostsideVpnTests passes with fix, fails without it
Change-Id: Ifa2710aed7e773a24786cc3e4912f126547dfe0b
2019-12-12 19:41:01 +09:00
Lorenzo Colitti
7b63a9afdf Merge "Improve code that decides whether Ethernet should be supported." 2019-12-05 07:18:03 +00:00
Lorenzo Colitti
cde74dff5d Improve code that decides whether Ethernet should be supported.
Currently, ConnectivityManagerTest checks whether the device
supports Ethernet by checking whether the OEM has configured it
in the networkAttributes array, or whether the Ethernet service
is running. It does this because devices that support USB host
mode enable Ethernet even if the OEM does not add Ethernet to
the networkAttributes array.

Unfortunately this does not work in instant mode because instant
apps cannot query the Ethernet service due to selinux policies.
In addition to querying whether the service is running (which
will continue to work in non-instant mode), also assume that
Ethernet is supported if the FEATURE_ETHERNET or FEATURE_USB_HOST
PackageManager flags are present.

This fixes various ConnectivityManagerTest testcases on devices
that support USB host mode but where the OEM has not added
Ethernet to the networkAttributes array.

Bug: 137630789
Bug: 143850345
Bug: 145482540
Test: atest android.net.cts.ConnectivityManagerTest#testIsNetworkSupported
Test: atest --instant android.net.cts.ConnectivityManagerTest#testIsNetworkSupported
Change-Id: Ie8a701f607967576a45c6b3c4f25c9c003aa3165
2019-12-05 13:39:00 +09:00
Treehugger Robot
f4130d6822 Merge "Add extra check for NetworkWatchlistTest" 2019-12-04 18:17:43 +00:00
Treehugger Robot
e409ded183 Merge "Merge Android10 QPR1 into AOSP master" 2019-12-03 23:15:06 +00:00
Luke Huang
31085ca1d4 Fix MultinetworkApiTest for instant mode
add AppModeFull@ to MultinetworkApiTest since WRITE_SECURE_SETTINGS
could not be ganted in instant mode.

Bug: 145559201
Test: atest MultinetworkApiTest
      atest MultinetworkApiTest --instant

Change-Id: If328ef92e58d3e03825d23253af0ce200819a853
2019-12-03 17:54:09 +08:00
Luke Huang
03ef526325 Fix testRawQueryNXDomain in DnsResolverTest
This test can not pass in T-Mobile Network becauseT-Mobile
has configured their network to return a "search page" when
the user looks up a name that doesn't exist.
Enable private DNS before doing nxDomain test.

Bug: 144521720
Test: atest MultinetworkApiTest

(cherry picked from commit 0545885206)

Change-Id: Iaa0e65813c4fb426d16f1a4a6e430d6501d68767
2019-11-28 11:18:25 +08:00
Luke Huang
276ed33f9e Fix testResNApi in MultinetworkApiTest
This test can not pass in T-Mobile Network becauseT-Mobile
has configured their network to return a "search page" when
the user looks up a name that doesn't exist.
Enable private DNS strict mode before doing testResNApi

Bug: 144521720
Test: atest MultinetworkApiTest

(cherry picked from commit a0d1ae43bf)

Change-Id: Id47045503adb0575c5f9e15fbc732c3c62912a9a
2019-11-28 11:17:42 +08:00
Luke Huang
a32ea36c31 Merge changes Ib4ef0843,I269962a3
am: f43b3bb3ee

Change-Id: I5574c3497e6fa33019827aca19e24d696c422cad
2019-11-25 09:12:20 -08:00
Luke Huang
0545885206 Fix testRawQueryNXDomain in DnsResolverTest
This test can not pass in T-Mobile Network becauseT-Mobile
has configured their network to return a "search page" when
the user looks up a name that doesn't exist.
Enable private DNS before doing nxDomain test.

Bug: 144521720
Test: atest MultinetworkApiTest
Change-Id: Ib4ef0843ebad0a897150d2bc30386b51126deeb4
2019-11-25 23:59:26 +08:00
Luke Huang
a0d1ae43bf Fix testResNApi in MultinetworkApiTest
This test can not pass in T-Mobile Network becauseT-Mobile
has configured their network to return a "search page" when
the user looks up a name that doesn't exist.
Enable private DNS strict mode before doing testResNApi

Bug: 144521720
Test: atest MultinetworkApiTest
Change-Id: I269962a30f224fd434a1915c9b1bf264f20b780c
2019-11-25 23:59:20 +08:00
Steven Liu
d71b50bd7d Merge "Allow 2 apps with NETWORK_CARRIER_PROVISION permission for wifi"
am: dc714602ca

Change-Id: I1bba2575132f587f03251a21913d34c6428f9d82
2019-11-08 09:27:05 -08:00
Steven Liu
4998a0203f Allow 2 apps with NETWORK_CARRIER_PROVISION permission for wifi
Bug: 143917577
Test: build
Change-Id: I25291651487e74d6d0bb36b47215d64e9a3b978c
2019-11-07 22:18:50 +00:00
Tomasz Wasilczyk
72a4107082 Add extra check for NetworkWatchlistTest
Bug: 120143468
Test: atest android.net.cts.NetworkWatchlistTest#testGetWatchlistConfigHash
Change-Id: I39c0da113a492cae719f7bb7940b86b758272f15
2019-11-06 13:33:32 -08:00
Amit Mahajan
2af1095c3e Merge "Use update constructor for AudioGroup."
am: 39ae795f38

Change-Id: Iad6be4c066adcec9ccfedc2a21ff199162c4a677
2019-11-01 17:11:24 -07:00
Amit Mahajan
fca8772db7 Use update constructor for AudioGroup.
Test: basic sanity
Bug: 140872785
Merged-in: Ie5bdca10cd80b4b7d0241f9b1b4afdebca8aeb04
Change-Id: Ie5bdca10cd80b4b7d0241f9b1b4afdebca8aeb04
(cherry picked from commit a261dcd8cd)
2019-11-01 20:07:29 +00:00
Xin Li
3238bb8068 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Bug: 142003500
Change-Id: I36c36cd88cb36648a3343aeb191d497eba170c9a
2019-10-30 14:28:46 -07:00
Xin Li
39ec8275f0 Merge Coral/Flame into AOSP master
Bug: 141248619
Change-Id: Iaba32e3e94ccfbeb953807b364ab7a6264aa709a
Merged-In: Ia414339f44c010134faf02d87bcbfba140165398
2019-10-25 10:27:45 -07:00
Bookatz
421f3f4eb1 Merge "CTS secondary_user: CtsNativeNetTestCases"
am: eae810977d

Change-Id: Iae22a28251b1d7cbcd6eb49567f1a3350b249cbc
2019-10-25 01:34:37 -07:00
Bookatz
07e89e4601 Merge "CTS secondary_user: CtsNetApi23TestCases"
am: 32dbf1f7e4

Change-Id: I546f02bd4cdf2419805704d9272771a4161011ea
2019-10-25 01:34:06 -07:00
Bookatz
d277b9c3c4 Merge "CTS secondary_user: CtsNativeNetDnsTestCases"
am: dcc0677c72

Change-Id: I45d6ee5cbf37c7556a48fe7aae841e496ae0c3a0
2019-10-25 01:34:00 -07:00
Treehugger Robot
eae810977d Merge "CTS secondary_user: CtsNativeNetTestCases" 2019-10-25 08:16:47 +00:00
Treehugger Robot
32dbf1f7e4 Merge "CTS secondary_user: CtsNetApi23TestCases" 2019-10-25 08:16:47 +00:00
Treehugger Robot
dcc0677c72 Merge "CTS secondary_user: CtsNativeNetDnsTestCases" 2019-10-25 08:16:47 +00:00
Bookatz
306cf25378 CTS secondary_user: CtsNetApi23TestCases
Marks this CTS test module as supporting secondary_user, meaning that
the tests are eligible to be run from a regular Android user other
than the system user (i.e. other than user 0).

Note that 'user' here refers to the concept of users in Android
Multiuser; it is NOT the same as a uid.

Bug: 141773058
Test: module passed with secondary_user params
 (--enable-optional-parameterization --module-parameter secondary_user)

Change-Id: I306953dbe90f1c4772c3bc26d6f73279c1ac525a
2019-10-24 09:59:43 -07:00
Bookatz
42919c7b96 CTS secondary_user: CtsNativeNetDnsTestCases
Marks this CTS test module as supporting secondary_user, meaning that
the tests are eligible to be run from a regular Android user other
than the system user (i.e. other than user 0).

Note that 'user' here refers to the concept of users in Android
Multiuser; it is NOT the same as a uid.

Bug: 141773058
Test: module passed with secondary_user params
 (--enable-optional-parameterization --module-parameter secondary_user)

Change-Id: I8d9a9b56d5f392548032c5e50730d6c5528f8f91
2019-10-24 09:59:09 -07:00
Bookatz
ba585050d9 CTS secondary_user: CtsNativeNetTestCases
Marks this CTS test module as supporting secondary_user, meaning that
the tests are eligible to be run from a regular Android user other
than the system user (i.e. other than user 0).

Note that 'user' here refers to the concept of users in Android
Multiuser; it is NOT the same as a uid.

Bug: 141773058
Test: module passed with secondary_user params
 (--enable-optional-parameterization --module-parameter secondary_user)

Change-Id: I1d904c733ed6bc52b8fe3909c34b0ad186b7fd43
2019-10-24 09:58:43 -07:00
Junyu Lai
8d03ba0e98 Merge "Set keepalive socket timeout to default value"
am: 4c8baa10f9

Change-Id: I60e888f24a7de7dba0a09cd4cec2d13d5b47bb91
2019-10-24 02:41:33 -07:00
junyulai
18c1592a6c Set keepalive socket timeout to default value
Fix: 142978377
Test: 1. atest android.net.cts.ConnectivityManagerTest\
         #testSocketKeepaliveLimitWifi --generate-new-metrics 10
      2. atest android.net.cts.ConnectivityManagerTest
      3. manual simulate connection timeout by changing test
         address

Change-Id: Idb786e38e87be253e0af11a9ffebf984bf23ead0
2019-10-24 15:42:36 +08:00
Jeffrey Vander Stoep
ab361a6fbd Merge "getConnectionOwnerUid: add test for b/141603906"
am: e8a8d9a26f

Change-Id: Ifbd37612218efb8b664d22698c64f6fdadbfafb8
2019-10-08 03:27:58 -07:00
Jeff Vander Stoep
c9068f1b87 getConnectionOwnerUid: add test for b/141603906
Test: on Marlin and Blueline run
    cts-tradefed run cts -m CtsHostsideNetworkTests \
    -t com.android.cts.net.HostsideVpnTests#testB141603906
Bug: 141603906
Change-Id: I759bc2295b2060e4575d61718c551d201a6455be
2019-10-08 10:41:45 +02:00
TreeHugger Robot
fd409edeca Merge "Add test for WifiInfo#getFrequency()" into qt-dev 2019-08-29 03:17:58 +00:00
Chen Zhu
ed78fc8745 Merge "Add CtsNetTestCases and CtsNativeNetDnsTestCases to MTS." into qt-dev am: be3a471e33
am: ab9710f837

Change-Id: I6c94738d0b9e372623ad3b8518d6494ab4912ab8
2019-08-26 22:05:36 -07:00
Chen Zhu
ab9710f837 Merge "Add CtsNetTestCases and CtsNativeNetDnsTestCases to MTS." into qt-dev
am: be3a471e33

Change-Id: Ie3b58f7a9fe2f195d51ccb0af243d27cfd2b3a65
2019-08-26 21:58:32 -07:00
Chen Zhu
be3a471e33 Merge "Add CtsNetTestCases and CtsNativeNetDnsTestCases to MTS." into qt-dev 2019-08-27 04:38:13 +00:00
Remi NGUYEN VAN
d6f08f48e0 Add test for WifiInfo#getFrequency()
Add getFrequency() to WifiInfoTest (along with other missing getters),
and test that it is consistent with ScanResult in ScanResultTest.

Test: atest android.net.wifi.cts.ScanResultTest
Fixes: b/138929469
Merged-In: I070b16661bc72a5c5035b0b227821b680d7d71ba
Merged-In: Ie99011acbbe66e9088f73964fd0c39d640594011
(cherry picked from commit 9c97c58656)

Change-Id: I83416c24c20c6774b2a66bf822419616f8cc5ab2
2019-08-26 10:32:02 +00:00
Maciej Zenczykowski
b559b8cd82 Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into qt-dev
am: 86301dddcd

Change-Id: Ie40c609af50bb2718f8a7771201fcd6d9e28be25
2019-08-21 18:09:03 -07:00
Erik Kline
6ee1049428 Attempt "fix" the broken QUIC packet to be slightly less broken
Bug: 139403355
Merged-In: I372c0730c9bd5329761b5a74b38e0f743bfd8230
(cherry picked from commit d6af2b5225249b178ee69dc5bac9b40c46f08d76)

Change-Id: I2955a3f9e733a5e39813a26e4cd630f79ae144a0
2019-08-21 18:37:03 +00:00