David Su
80f30deb26
Merge "Scan Optimization: Check set device mobility permission is granted to <= 1 app"
2018-12-18 01:31:55 +00:00
Xin Li
23ff07b327
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: d80076c038 -s ours am: 6046e7a005 -s ours
...
am: 622ab2685e -s ours
Change-Id: I6d8bfe2501f7bc200f99163ba65b3a04e8a2719c
2018-12-13 14:15:55 -08:00
Xin Li
ac76c4b83b
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 61b64108d7 -s ours am: f032484732 -s ours
...
am: ba9ecd40fd -s ours
Change-Id: I7812eba5a69ea9a01cf7d701b410524f0b7f1101
2018-12-13 13:50:18 -08:00
Xin Li
622ab2685e
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: d80076c038 -s ours
...
am: 6046e7a005 -s ours
Change-Id: I3dc189305098e5d24a14b316171b7854511c24f6
2018-12-13 12:37:23 -08:00
Xin Li
ba9ecd40fd
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 61b64108d7 -s ours
...
am: f032484732 -s ours
Change-Id: I237ed5f87b9a7a1a1d70934c658a997919c316a1
2018-12-13 12:13:12 -08:00
Xin Li
6046e7a005
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"
...
am: d80076c038 -s ours
Change-Id: Ifce9205916de6ef70418904771aedd762f23e57c
2018-12-13 11:53:33 -08:00
Xin Li
f032484732
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
...
am: 61b64108d7 -s ours
Change-Id: Ie6809bd88ad77c622152fb9a48c54178ee1868ee
2018-12-13 11:13:46 -08:00
Treehugger Robot
d80076c038
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"
2018-12-13 05:45:20 +00:00
Lorenzo Colitti
0b2dafe187
Merge "Test for asynchronous DNS query API" am: 6357dee73d am: 201ef3ffbe
...
am: 48d74ad5cb
Change-Id: I1ba80f774630378daa1a7cb7323bdbcafb619c81
2018-12-12 21:18:27 -08:00
Lorenzo Colitti
48d74ad5cb
Merge "Test for asynchronous DNS query API" am: 6357dee73d
...
am: 201ef3ffbe
Change-Id: I9e2ef04abe7b27ff3c4aee61f0597f6d95011837
2018-12-12 20:39:05 -08:00
Lorenzo Colitti
201ef3ffbe
Merge "Test for asynchronous DNS query API"
...
am: 6357dee73d
Change-Id: Ie13c5cf9ce4510a6565cae6da5cfd99b01c0b964
2018-12-12 20:20:26 -08:00
Xin Li
61b64108d7
DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
...
Bug: 120502534
Change-Id: I9857d44f5eeabf6c1ed6b4d872a1bdf22e351a6c
2018-12-11 18:15:44 -08:00
Xin Li
faa0634c9a
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master am: 9d3113f2ca -s ours
...
am: 3c2f98c24f -s ours
Change-Id: I5f37711dd7481d84214cb9457c3f99331a3f2e47
2018-12-11 15:30:06 -08:00
Xin Li
3c2f98c24f
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
...
am: 9d3113f2ca -s ours
Change-Id: Ic1c34f58c5e3c769e9a00c6604b7cdf9278ba181
2018-12-11 15:01:30 -08:00
Xin Li
9d3113f2ca
DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
...
Bug: 120502534
Change-Id: I47ec78e46d4fe69da5e42c5887afb914ce231014
2018-12-11 20:27:01 +00:00
Luke Huang
3c5f35a38e
Test for asynchronous DNS query API
...
Add basic test for asynchronous DNS query API
Test: build
atest CtsNativeNetDnsTestCases
Change-Id: Ib757ba8f0128d3efe7dfbcbfb45d36e4350834f9
2018-12-12 04:18:07 +08:00
Ivan Chiang
5ba068b2e7
Merge "Add test for Uri.toSafeString" am: 5a6e995881 am: 63d823e08c
...
am: c6d2e4cfa1
Change-Id: I38333ca0f58cf306ea3978e7f55ddff5fad94cbd
2018-12-10 07:21:44 -08:00
Ivan Chiang
c6d2e4cfa1
Merge "Add test for Uri.toSafeString" am: 5a6e995881
...
am: 63d823e08c
Change-Id: Ie3cf50686b232db643cfbb50c2a82f712c54af30
2018-12-10 07:07:56 -08:00
Ivan Chiang
63d823e08c
Merge "Add test for Uri.toSafeString"
...
am: 5a6e995881
Change-Id: I8803eccdc3489f923be2bc26151cbff699ea259c
2018-12-10 06:56:16 -08:00
Ivan Chiang
5a6e995881
Merge "Add test for Uri.toSafeString"
2018-12-10 14:32:36 +00:00
Rebecca Silberstein
d0e50a9a1c
Merge "Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev am: 7bd8640f4d -s ours" into pie-cts-dev am: a9d9e557e6 -s ours" am: 695f741a71 -s ours am: c580f11166 -s ours
...
am: d5b11c0adc -s ours
Change-Id: Ic579b999caae59a96ac0a6a71179c0ccff8940c9
2018-12-05 22:43:03 -08:00
Rebecca Silberstein
5902fe3f06
Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev am: 7bd8640f4d -s ours am: 97a50a1348 -s ours am: d543481f22 -s ours
...
am: ba27b5de9e -s ours
Change-Id: I36f0fcc927635647f431e13b57983b40a545f261
2018-12-05 22:31:59 -08:00
Rebecca Silberstein
d5b11c0adc
Merge "Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev am: 7bd8640f4d -s ours" into pie-cts-dev am: a9d9e557e6 -s ours" am: 695f741a71 -s ours
...
am: c580f11166 -s ours
Change-Id: I5c0d6554e64dc17bfc8c03bd175ca552e586e014
2018-12-05 22:04:53 -08:00
Rebecca Silberstein
ba27b5de9e
Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev am: 7bd8640f4d -s ours am: 97a50a1348 -s ours
...
am: d543481f22 -s ours
Change-Id: Id2d454c6e8f81c13b9018dd5c7310251bfec2d35
2018-12-05 21:51:30 -08:00
Rebecca Silberstein
f68e6e9ecc
Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev am: 7bd8640f4d -s ours" into pie-cts-dev am: a9d9e557e6 -s ours am: 19fe49302c -s ours
...
am: 29b2bd0177 -s ours
Change-Id: If355b80be4c66e36266e90a35e85cdbde0ba9ba9
2018-12-05 21:50:57 -08:00
Rebecca Silberstein
c580f11166
Merge "Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev am: 7bd8640f4d -s ours" into pie-cts-dev am: a9d9e557e6 -s ours"
...
am: 695f741a71 -s ours
Change-Id: I37f9750c36530b4360affe7a393ea02423d9746f
2018-12-05 21:36:13 -08:00
Rebecca Silberstein
d543481f22
Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev am: 7bd8640f4d -s ours
...
am: 97a50a1348 -s ours
Change-Id: I6675f933f29508f9b553ecad62b18e14823b9100
2018-12-05 21:31:36 -08:00
Rebecca Silberstein
29b2bd0177
Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev am: 7bd8640f4d -s ours" into pie-cts-dev am: a9d9e557e6 -s ours
...
am: 19fe49302c -s ours
Change-Id: Iec2f86a069406318d9d98a36302c3b68f2cada7d
2018-12-05 21:20:06 -08:00
Rebecca Silberstein
19fe49302c
Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev am: 7bd8640f4d -s ours" into pie-cts-dev
...
am: a9d9e557e6 -s ours
Change-Id: I5b19971e761cdbce47c483873407e0a7a7fc7813
2018-12-05 21:09:14 -08:00
Rebecca Silberstein
97a50a1348
Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev
...
am: 7bd8640f4d -s ours
Change-Id: I3c6b067aa7bf8e1c54481dba8220f986d52a8687
2018-12-05 21:07:45 -08:00
Android Merger
695f741a71
Merge "Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev am: 7bd8640f4d -s ours" into pie-cts-dev am: a9d9e557e6 -s ours"
2018-12-06 04:59:14 +00:00
Rebecca Silberstein
16d6f1f7db
Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev am: 7bd8640f4d -s ours" into pie-cts-dev
...
am: a9d9e557e6 -s ours
Change-Id: I1b25fb88bf2c8c945ee0a2140fad0bd4faa988f6
2018-12-05 20:59:02 -08:00
Android Merger
a9d9e557e6
Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev am: 7bd8640f4d -s ours" into pie-cts-dev
2018-12-06 04:51:40 +00:00
Rebecca Silberstein
a6b44c093b
Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev
...
am: 7bd8640f4d -s ours
Change-Id: I68872ec4c09a800163bfffbea79c5712d5538ccd
2018-12-05 20:51:32 -08:00
Android Merger
7bd8640f4d
Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev
2018-12-06 04:45:48 +00:00
Rebecca Silberstein
ac3705bf4c
[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev
...
am: 8c61445473 -s ours
Change-Id: I1581d4da5c0b0ffabb96941a8a416f7012630b80
2018-12-05 20:45:38 -08:00
Roshan Pius
1a62ec8d7c
[automerger skipped] resolve merge conflicts of 8c61445473bc2842c8c9490225e97321b65d267c to oc-dev am: 934ff00f93 am: 8619176b0c -s ours am: af0963872a -s ours am: 4b1354cbd6 -s ours
...
am: b22061a41b -s ours
Change-Id: I2ffa80544221ed60df557d2c62106b24e3b828ec
2018-12-04 21:10:35 -08:00
Roshan Pius
b22061a41b
[automerger skipped] resolve merge conflicts of 8c61445473bc2842c8c9490225e97321b65d267c to oc-dev am: 934ff00f93 am: 8619176b0c -s ours am: af0963872a -s ours
...
am: 4b1354cbd6 -s ours
Change-Id: I68881470e7c0e58cb3b02d26c8ad04b099a9f7be
2018-12-04 20:57:45 -08:00
Roshan Pius
4b1354cbd6
[automerger skipped] resolve merge conflicts of 8c61445473bc2842c8c9490225e97321b65d267c to oc-dev am: 934ff00f93 am: 8619176b0c -s ours
...
am: af0963872a -s ours
Change-Id: I1fa1986f48cffa55c3881f3c20a36c90adcad711
2018-12-04 20:49:59 -08:00
Roshan Pius
af0963872a
[automerger skipped] resolve merge conflicts of 8c61445473bc2842c8c9490225e97321b65d267c to oc-dev am: 934ff00f93
...
am: 8619176b0c -s ours
Change-Id: Ia5d10ee2a42c32632055765d1869801c0ad217c4
2018-12-04 20:45:16 -08:00
Roshan Pius
8619176b0c
resolve merge conflicts of 8c61445473bc2842c8c9490225e97321b65d267c to oc-dev
...
am: 934ff00f93
Change-Id: Ifac1fe67bda37bbbe5fa1d5be19f75ab51f34c8e
2018-12-04 20:40:44 -08:00
Roshan Pius
934ff00f93
resolve merge conflicts of 8c61445473bc2842c8c9490225e97321b65d267c to oc-dev
...
Bug: 120508352
Change-Id: I43ebc07102d0b765321a4b83c04ff899f2b8ed0c
Merged-In: Id3aaacb3651568c18850a0fdf3832c0f52218cf2
2018-12-05 03:15:07 +00:00
David Su
4b1386285a
Scan Optimization: Check set device mobility permission is granted to <= 1 app
...
Add a new CTS test to ensure that set device mobility permission is
granted to at most 1 app.
Bug: 120097108
Test: "atest WifiManagerTest" after installing app with new
permission granted
Change-Id: Ifda2163da6da9e9365c440d47031d25f92c6c375
2018-12-04 18:12:38 -08:00
Roshan Pius
8c9f1ec580
Merge "WifiManagerTest: Remove tests for deprecated API's"
2018-11-29 20:41:19 +00:00
Rebecca Silberstein
af95fad957
WifiManagerTest: allow for multiple modes
...
Now that WifiService can/will support dual simultaneous mode operation, make
sure the tests allow for it as well.
Bug: 31346104
Bug: 115567184
Test: atest android.net.wifi.cts
Change-Id: Id3aaacb3651568c18850a0fdf3832c0f52218cf2
Merged-In: Id3aaacb3651568c18850a0fdf3832c0f52218cf2
2018-11-29 15:24:49 +08:00
Bill Yi
28d9fb60c5
Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
...
Change-Id: Id9555bd1fed41e807cc34364ee6fdcad3864cc59
2018-11-28 18:33:32 -08:00
Kweku Adams
30897c29ef
Tests for app idle whitelisting.
...
Ensuring that app idle network whitelisting works as expected and does
not override other power saving restrictions.
Bug: 117846754
Bug: 111423978
Test: atest CtsHostsideNetworkTests
and atest NetworkPolicyManagerServiceTest
Change-Id: I09172184e2fe543d6723639e5e62ae6afd5a6087
2018-11-28 14:36:13 -08:00
Mark Chien
89dcfe055e
Merge "Exempt adb socket for hostside VpnTest" am: 1b99a84106 am: 78ca8f0922
...
am: 1acaa68419
Change-Id: I04ea63d2a8f4de90af63e90c09decc2edfada50e
2018-11-26 00:18:47 -08:00
Mark Chien
1acaa68419
Merge "Exempt adb socket for hostside VpnTest" am: 1b99a84106
...
am: 78ca8f0922
Change-Id: I0543c551d82002e6fc0a6115e614232062519328
2018-11-26 00:10:58 -08:00
Mark Chien
78ca8f0922
Merge "Exempt adb socket for hostside VpnTest"
...
am: 1b99a84106
Change-Id: I032a25b809c50f3119ca16d79880b194dee28652
2018-11-26 00:06:21 -08:00