Xin Li
ba9ecd40fd
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 61b64108d7 -s ours
...
am: f032484732
2018-12-13 12:13:12 -08:00
Xin Li
f032484732
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
...
am: 61b64108d7
2018-12-13 11:13:46 -08:00
Lorenzo Colitti
48d74ad5cb
Merge "Test for asynchronous DNS query API" am: 6357dee73d
...
am: 201ef3ffbe
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
3c2f98c24f
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
...
am: 9d3113f2ca
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
c6d2e4cfa1
Merge "Add test for Uri.toSafeString" am: 5a6e995881
...
am: 63d823e08c
2018-12-10 07:07:56 -08:00
Ivan Chiang
63d823e08c
Merge "Add test for Uri.toSafeString"
...
am: 5a6e995881
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
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
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
2018-12-05 21:51:30 -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
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
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
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
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
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
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
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
b22061a41b
[automerger skipped] resolve merge conflicts of 8c61445473bc2842c8c9490225e97321b65d267c to oc-dev am: 934ff00f93 am: 8619176b0c -s ours am: af0963872a -s ours
...
am: 4b1354cbd6
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
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
2018-12-04 20:45:16 -08:00
Roshan Pius
8619176b0c
resolve merge conflicts of 8c61445473bc2842c8c9490225e97321b65d267c to oc-dev
...
am: 934ff00f93
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
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
Mark Chien
1acaa68419
Merge "Exempt adb socket for hostside VpnTest" am: 1b99a84106
...
am: 78ca8f0922
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
markchien
de0f268f78
Exempt adb socket for hostside VpnTest
...
Vpn test would destroy socket. If adb run over network, adb
socket would be killed during Vpn test. Then, test stop due to
adb disconnect.
Bug: 119382723
Test: - build pass
- run cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideVpnTests
Change-Id: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
2018-11-22 20:39:46 +08:00
Tony Huang
c1ba8dd9ac
Add test for Uri.toSafeString
...
Due to exposing api of toSafeString, add coresponding testing
for it.
Bug: 119153962
Test: atest UriTest
Change-Id: I156b2b03ee9c1d4a05ac635b4f684c5b4dcfca08
2018-11-09 14:23:31 +08:00
Bill Yi
8a70fedf51
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: c25ddbfef4 -s ours
...
am: 7c34d32772
2018-10-24 19:52:50 -07:00
Bill Yi
7c34d32772
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
...
am: c25ddbfef4
2018-10-24 16:03:47 -07:00
Bill Yi
c25ddbfef4
Merge pie-platform-release to aosp-master - DO NOT MERGE
...
Change-Id: Ie395adde23471676aa6ea5604e3ced527dbf887a
2018-10-24 14:45:11 -07:00
Bill Yi
6c506ece24
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
am: fa18597e5e
2018-10-24 10:13:25 -07:00
Bill Yi
fa18597e5e
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
Change-Id: I53e68a9fa72d1f0635d4384fc7e9550e8a45d3c3
2018-10-24 09:04:51 -07:00
Bill Yi
71ca84e8e7
Merge pi-dr1-dev to aosp-master am: 394eb13546
...
am: b12ac32195
2018-10-19 14:46:17 -07:00
Bill Yi
b12ac32195
Merge pi-dr1-dev to aosp-master
...
am: 394eb13546
2018-10-19 14:37:23 -07:00
Bill Yi
394eb13546
Merge pi-dr1-dev to aosp-master
...
Change-Id: I7cd9310e06805e7d2b70a53873f5f0e235c0ac38
2018-10-19 12:20:13 -07:00
Chalard Jean
3795638e43
Merge "Add Uri tests for IPv6 literal adresses" am: 3d869fea91
...
am: 4b6c4acdb7
2018-10-19 06:09:10 -07:00
Chalard Jean
4b6c4acdb7
Merge "Add Uri tests for IPv6 literal adresses"
...
am: 3d869fea91
2018-10-19 05:07:08 -07:00
Treehugger Robot
3d869fea91
Merge "Add Uri tests for IPv6 literal adresses"
2018-10-19 11:04:29 +00:00
Chalard Jean
2a41b1cdda
Add Uri tests for IPv6 literal adresses
...
Bug: 25540738
Test: this
Change-Id: Id63a5dd17293014218df78bcb440993cc5f3beb8
2018-10-19 08:56:18 +00:00
Neil Fuller
12c7d2828d
Merge "Remove explicit dependency on conscrypt" am: 92ed75c5f7
...
am: 895ebc7f40
2018-10-12 04:01:18 -07:00
Neil Fuller
895ebc7f40
Merge "Remove explicit dependency on conscrypt"
...
am: 92ed75c5f7
Change-Id: I46191c34b492a7ccb4c679a8e5d133d29a407b15
2018-10-12 03:53:06 -07:00
Neil Fuller
0b72fa9cfe
Remove explicit dependency on conscrypt
...
The dependency is unnecessary as by default conscrypt
is included in the "standard libraries".
Test: build
Bug: 113148576
Change-Id: I30d68049215c61931bdd7aa5e2a0f125e6d1bf90
2018-10-11 16:11:37 +01:00
