Commit Graph

3809 Commits

Author SHA1 Message Date
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
96f2a111bb Merge "Improve code that decides whether Ethernet should be supported." am: 7b63a9afdf
am: f4739d85d8

Change-Id: Ifaff2fa1b8e9dc329b42d6e845851a524b6bb6fc
2019-12-04 23:31:55 -08:00
Lorenzo Colitti
f4739d85d8 Merge "Improve code that decides whether Ethernet should be supported."
am: 7b63a9afdf

Change-Id: I94442f7818b3da94f468c0532c3eb8013cd959d3
2019-12-04 23:27:37 -08: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
Tomasz Wasilczyk
d6398544a6 Merge "Add extra check for NetworkWatchlistTest" am: f4130d6822
am: a09b433e06

Change-Id: I0b7babfb4b0e919136e6dd069c61f223c6039af5
2019-12-04 10:28:53 -08:00
Tomasz Wasilczyk
a09b433e06 Merge "Add extra check for NetworkWatchlistTest"
am: f4130d6822

Change-Id: I196889432036b9232507f926f8bee9376ecd0636
2019-12-04 10:24:40 -08:00
Treehugger Robot
f4130d6822 Merge "Add extra check for NetworkWatchlistTest" 2019-12-04 18:17:43 +00:00
Xin Li
cd6cd0915d Merge "Merge Android10 QPR1 into AOSP master" am: e409ded183
am: 08da6f5b47

Change-Id: Icd21a86ae81199047ccc33bbc44a622ad2e51a6d
2019-12-04 08:07:53 -08:00
Xin Li
08da6f5b47 Merge "Merge Android10 QPR1 into AOSP master"
am: e409ded183

Change-Id: Idcdacfb27901a118b4e0a52d77436e30f8d5d3e5
2019-12-03 16:07:49 -08:00
Treehugger Robot
e409ded183 Merge "Merge Android10 QPR1 into AOSP master" 2019-12-03 23:15:06 +00:00
Luke Huang
a503dd1e70 Merge "Fix MultinetworkApiTest for instant mode" am: f2987a79a2
am: 1802980b98

Change-Id: I8cc151075f375597f71c5bb19e750475487b8209
2019-12-03 08:49:51 -08:00
Luke Huang
cecf84247e Merge "Fix testRawQueryNXDomain in DnsResolverTest" into qt-r1-dev am: eb27a2da7e
am: 268457a507

Change-Id: I094acf985d6bfef9f16bafce08eb6d7dce612aa5
2019-12-03 08:40:14 -08:00
Luke Huang
1802980b98 Merge "Fix MultinetworkApiTest for instant mode"
am: f2987a79a2

Change-Id: I8612e40973e33315f6a1c68ecc3dbdbb1bbc7e37
2019-12-03 08:38:52 -08:00
Luke Huang
2624f8dcc0 Merge "Fix testResNApi in MultinetworkApiTest" into qt-r1-dev am: 16a47029ed
am: bb2b69027d

Change-Id: Ic94095c7420b4baee78051f06efd943ea9fe1ee1
2019-12-03 08:31:10 -08:00
Treehugger Robot
f2987a79a2 Merge "Fix MultinetworkApiTest for instant mode" 2019-12-03 10:50:44 +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
Xin Li
061fea79eb Merge Android10 QPR1 into AOSP master
Bug: 145570283
Change-Id: I5d4ce122ba88291691f6a8058b5b0181ad02763c
2019-12-02 21:25:02 -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
5f77b28ba9 Merge changes Ib4ef0843,I269962a3 am: f43b3bb3ee
am: a32ea36c31

Change-Id: I05e0bef71501155fa94f73b7444c9feca60aab6b
2019-11-25 09:17:46 -08:00
Luke Huang
a32ea36c31 Merge changes Ib4ef0843,I269962a3
am: f43b3bb3ee

Change-Id: I5574c3497e6fa33019827aca19e24d696c422cad
2019-11-25 09:12:20 -08:00
Treehugger Robot
f43b3bb3ee Merge changes Ib4ef0843,I269962a3
* changes:
  Fix testRawQueryNXDomain in DnsResolverTest
  Fix testResNApi in MultinetworkApiTest
2019-11-25 17:04:04 +00: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
19dd4bcce8 Merge "Allow 2 apps with NETWORK_CARRIER_PROVISION permission for wifi" am: dc714602ca
am: d71b50bd7d

Change-Id: I67fb9a1f02ad24a9cc9b553418d42ba29e1dc28a
2019-11-08 09:31:25 -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
b0e884feb2 Merge "Use update constructor for AudioGroup." am: 39ae795f38
am: 2af1095c3e

Change-Id: I425e2548c52449e53eb092d0c2e62cbffb119130
2019-11-01 17:18:29 -07: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
9c066c33d8 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: 3238bb8068

Change-Id: I9841900fd587d6ae42bef00788ca346c6143c296
2019-10-31 13:14:06 -07: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
f8bea674e2 [automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: 7512fc4407 -s ours am: d8368c7ee9 -s ours
am: 7b9d907b2b -s ours
am skip reason: change_id Ia414339f44c010134faf02d87bcbfba140165398 with SHA1 6e1b2be2f5 is in history

Change-Id: I3fcfaa9ab9b8ef8de8700aa79422e31cf11552f6
2019-10-26 23:35:28 -07:00
Xin Li
7b9d907b2b [automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: 7512fc4407 -s ours
am: d8368c7ee9 -s ours
am skip reason: change_id Ia414339f44c010134faf02d87bcbfba140165398 with SHA1 6e1b2be2f5 is in history

Change-Id: I7ba1d900e08829350cd929a2130c8c9ece24baf2
2019-10-26 23:11:20 -07:00
Xin Li
d8368c7ee9 [automerger skipped] Merge "Merge Coral/Flame into AOSP master"
am: 7512fc4407 -s ours
am skip reason: change_id Ia414339f44c010134faf02d87bcbfba140165398 with SHA1 6e1b2be2f5 is in history

Change-Id: I3340ce47ce908daab8496b6dd60a189602549703
2019-10-26 22:48:21 -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
3b27402548 Merge "CTS secondary_user: CtsNativeNetTestCases" am: eae810977d am: 421f3f4eb1
am: 09ad73a386

Change-Id: I0088b266318049c346e76d753eb60cb30344a4be
2019-10-25 01:57:26 -07:00
Bookatz
14696298f5 Merge "CTS secondary_user: CtsNetApi23TestCases" am: 32dbf1f7e4 am: 07e89e4601
am: bc64102b1f

Change-Id: Id25d1a1057dd1313e61bb3909de032d61527f85a
2019-10-25 01:56:53 -07:00
Bookatz
304ff02950 Merge "CTS secondary_user: CtsNativeNetDnsTestCases" am: dcc0677c72 am: d277b9c3c4
am: 62c2bd3167

Change-Id: Ic8b22a57e99f78572299e4d3907e3355d8d8581b
2019-10-25 01:56:46 -07:00
Bookatz
09ad73a386 Merge "CTS secondary_user: CtsNativeNetTestCases" am: eae810977d
am: 421f3f4eb1

Change-Id: I07e29985cee9dbcecb4e88d89adc8bf326070817
2019-10-25 01:47:02 -07:00
Bookatz
bc64102b1f Merge "CTS secondary_user: CtsNetApi23TestCases" am: 32dbf1f7e4
am: 07e89e4601

Change-Id: I3d604eb604130f41a4a0ce5b6c63de75b679d589
2019-10-25 01:46:26 -07:00
Bookatz
62c2bd3167 Merge "CTS secondary_user: CtsNativeNetDnsTestCases" am: dcc0677c72
am: d277b9c3c4

Change-Id: I7486ea42408b12cd244c84f89d416804515b5cb5
2019-10-25 01:46:18 -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