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
2019-12-04 08:07:53 -08:00
Xin Li
08da6f5b47
Merge "Merge Android10 QPR1 into AOSP master"
...
am: e409ded183
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
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
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
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
2019-11-28 11:17:42 +08:00
Luke Huang
3dffe6e2eb
Merge changes Ib4ef0843,I269962a3 am: f43b3bb3ee am: a32ea36c31
...
am: 5f77b28ba9
2019-11-25 10:28:27 -08:00
Luke Huang
5f77b28ba9
Merge changes Ib4ef0843,I269962a3 am: f43b3bb3ee
...
am: a32ea36c31
2019-11-25 09:17:46 -08:00
Luke Huang
a32ea36c31
Merge changes Ib4ef0843,I269962a3
...
am: f43b3bb3ee
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
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
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
Amit Mahajan
7e78a94d9a
[automerger skipped] Merge "Use update constructor for AudioGroup." am: 39ae795f38 am: 2af1095c3e
...
am: b0e884feb2a261dcd8cd
2019-11-01 17:28:45 -07:00
Amit Mahajan
b0e884feb2
Merge "Use update constructor for AudioGroup." am: 39ae795f38
...
am: 2af1095c3e
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
3b20a31547
[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 3238bb8068
...
am: 9c066c33d8
2019-10-31 14:01:28 -07:00
Xin Li
9c066c33d8
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
...
am: 3238bb8068
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
e3128510bf
[automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: 7512fc4407 -s ours am: d8368c7ee9 -s ours am: 7b9d907b2b -s ours
...
am: f8bea674e2
2019-10-26 23:55:18 -07:00
Xin Li
f8bea674e2
[automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: 7512fc4407 -s ours am: d8368c7ee9 -s ours
...
am: 7b9d907b2b
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
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
5175525e62
Merge "CTS secondary_user: CtsNativeNetTestCases" am: eae810977d am: 421f3f4eb1 am: 09ad73a386
...
am: 3b27402548
2019-10-25 02:10:09 -07:00
Bookatz
ffee0a5805
Merge "CTS secondary_user: CtsNetApi23TestCases" am: 32dbf1f7e4 am: 07e89e4601 am: bc64102b1f
...
am: 14696298f5
2019-10-25 02:09:29 -07:00
Bookatz
3770a80626
Merge "CTS secondary_user: CtsNativeNetDnsTestCases" am: dcc0677c72 am: d277b9c3c4 am: 62c2bd3167
...
am: 304ff02950
2019-10-25 02:09:21 -07:00
Bookatz
3b27402548
Merge "CTS secondary_user: CtsNativeNetTestCases" am: eae810977d am: 421f3f4eb1
...
am: 09ad73a386
2019-10-25 01:57:26 -07:00
Bookatz
14696298f5
Merge "CTS secondary_user: CtsNetApi23TestCases" am: 32dbf1f7e4 am: 07e89e4601
...
am: bc64102b1f
2019-10-25 01:56:53 -07:00
Bookatz
304ff02950
Merge "CTS secondary_user: CtsNativeNetDnsTestCases" am: dcc0677c72 am: d277b9c3c4
...
am: 62c2bd3167
2019-10-25 01:56:46 -07:00
Bookatz
09ad73a386
Merge "CTS secondary_user: CtsNativeNetTestCases" am: eae810977d
...
am: 421f3f4eb1
2019-10-25 01:47:02 -07:00
Bookatz
bc64102b1f
Merge "CTS secondary_user: CtsNetApi23TestCases" am: 32dbf1f7e4
...
am: 07e89e4601
2019-10-25 01:46:26 -07:00
Bookatz
62c2bd3167
Merge "CTS secondary_user: CtsNativeNetDnsTestCases" am: dcc0677c72
...
am: d277b9c3c4
2019-10-25 01:46:18 -07:00
