Commit Graph

4005 Commits

Author SHA1 Message Date
Etan Cohen
3a90dcdb60 [AWARE] Add API to expose supported cipher suites
Provide a new Aware capabilities API which exposes the supported
cipher suites. These cipher suites are used to negotiate the data-
path. The framework automatially selects the strongest cipher suite
when it initiates a negotiation.

Bug: 145697276
Test: (CTS) atest SingleDeviceTest
Change-Id: Ifc735978aecf3a655ca3115a4659e636f69ebf31
2019-12-13 18:33:16 -08:00
Automerger Merge Worker
e7143619a3 [automerger skipped] Merge "Add a CTS test for private DNS on VPNs." into pi-dev am: a7df60640f -s ours am: ea28c5a250 -s ours am: 45fc9d14d6 -s ours am: 26cf62857d -s ours am: 0053fec176 -s ours
am skip reason: Change-Id Ifa2710aed7e773a24786cc3e4912f126547dfe0b with SHA-1 3b160e2385 is in history

Change-Id: I5c624fef2085d31408a1afd971fc1eb17f094365
2019-12-13 08:37:34 +00:00
Automerger Merge Worker
0053fec176 [automerger skipped] Merge "Add a CTS test for private DNS on VPNs." into pi-dev am: a7df60640f -s ours am: ea28c5a250 -s ours am: 45fc9d14d6 -s ours am: 26cf62857d -s ours
am skip reason: Change-Id Ifa2710aed7e773a24786cc3e4912f126547dfe0b with SHA-1 3b160e2385 is in history

Change-Id: I7182910f244b1c0adcb254adeb6fb5c20da5f4d4
2019-12-13 08:25:16 +00:00
Automerger Merge Worker
45fc9d14d6 [automerger skipped] Merge "Add a CTS test for private DNS on VPNs." into pi-dev am: a7df60640f -s ours am: ea28c5a250 -s ours
am skip reason: Change-Id Ifa2710aed7e773a24786cc3e4912f126547dfe0b with SHA-1 3b160e2385 is in history

Change-Id: I74865316a615b0a7e96b02b61133dc03cb8bec15
2019-12-13 07:51:11 +00:00
Automerger Merge Worker
ea28c5a250 [automerger skipped] Merge "Add a CTS test for private DNS on VPNs." into pi-dev am: a7df60640f -s ours
am skip reason: Change-Id Ifa2710aed7e773a24786cc3e4912f126547dfe0b with SHA-1 3b160e2385 is in history

Change-Id: I351adf65d7cefb1a97ddee9a80ed9978b28d0187
2019-12-13 07:31:21 +00:00
Automerger Merge Worker
0fdd1ee38b Merge "Add a CTS test for private DNS on VPNs." into qt-dev am: 17311d9af6 am: fe44dd21ba am: 523cc30322 am: b29ba93dcd
Change-Id: I20a4d12beb846fa0d192e6426719c762ffb0c187
2019-12-13 02:27:54 +00: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
7064ea15bb 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: Idc0690dfe6d000337b272bbd55ea4d773aebd5ed
Merged-In: Ifa2710aed7e773a24786cc3e4912f126547dfe0b
2019-12-12 19:36:20 +09:00
Lorenzo Colitti
ff7fa516a7 Merge "Improve code that decides whether Ethernet should be supported." am: 7b63a9afdf am: f4739d85d8
am: 96f2a111bb

Change-Id: I1af6f1331a0ab71e7dc5adfe7b92d9285285b356
2019-12-06 00:28:55 -08: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
ad5f37b5b8 Merge "Add extra check for NetworkWatchlistTest" am: f4130d6822 am: a09b433e06
am: d6398544a6

Change-Id: Iec9accd18920cb742cfe4d976c5d0343c6f5b639
2019-12-04 17:17:14 -08: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
Automerger Merge Worker
ca9ba2b23d Merge "Merge Android10 QPR1 into AOSP master" am: e409ded183 am: cd6cd0915d
Change-Id: I9055a6ea3ab160adf780b6e39d6ee344ab65a7a3
2019-12-04 16:58:08 +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
Automerger Merge Worker
fed773cb0e Merge "Fix MultinetworkApiTest for instant mode" am: f2987a79a2 am: a503dd1e70
Change-Id: I838f8968f980454f9ca61fb906fc16c8eeced834
2019-12-03 17:37:44 +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
Automerger Merge Worker
fcddd087f3 Merge "Fix testRawQueryNXDomain in DnsResolverTest" into qt-r1-dev am: eb27a2da7e am: cecf84247e
Change-Id: I820fc785fd854284f440203522afd60b186a0d7c
2019-12-03 16:46:04 +00:00
Automerger Merge Worker
0f7689ef42 Merge "Fix testResNApi in MultinetworkApiTest" into qt-r1-dev am: 16a47029ed am: 2624f8dcc0
Change-Id: Ib62984530d4fd967bedcc6ae61a6dde4a9ecca36
2019-12-03 16:42:03 +00: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
3dffe6e2eb Merge changes Ib4ef0843,I269962a3 am: f43b3bb3ee am: a32ea36c31
am: 5f77b28ba9

Change-Id: Id69c4908b374984e7ad20af50dc7dc4e3b9a81b3
2019-11-25 10:28:27 -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
David Su
166e83cd7a Rename WifiSsid.NONE to WifiManager.UNKNOWN_SSID
Bug: 144311098
Test: compiles
Change-Id: I8235c909c6b99e5a5e2adcf4c2a364ebd8faf913
2019-11-12 18:53:24 -08:00
Patrik Fimml
0b70bb209d Merge "Configurable SoftAP: Add CTS test." 2019-11-08 17:39:36 +00:00
Steven Liu
d4cd31d635 Merge "Allow 2 apps with NETWORK_CARRIER_PROVISION permission for wifi" am: dc714602ca am: d71b50bd7d
am: 19dd4bcce8

Change-Id: Ib4ff9d666476bde1bc1d8e673abd4d23e5922484
2019-11-08 09:37:30 -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
Patrik Fimml
461242c670 Configurable SoftAP: Add CTS test.
This uses a recently-introduced mechanism that allows testing System
APIs from CTS.

Bug: 132705022
Test: atest android.net.wifi.cts.WifiManagerTest#testStartLocalOnlyHotspotWithConfig
Change-Id: Ifeb502600122919f205dfd66b6b62c18f2920309
2019-11-08 16:37:10 +01: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
7e78a94d9a [automerger skipped] Merge "Use update constructor for AudioGroup." am: 39ae795f38 am: 2af1095c3e
am: b0e884feb2 -s ours
am skip reason: change_id Ie5bdca10cd80b4b7d0241f9b1b4afdebca8aeb04 with SHA1 a261dcd8cd is in history

Change-Id: If6e377dd0592e2795b12929417899770bc07eae8
2019-11-01 17:28:45 -07:00