Chenbo Feng
833dc5bd2c
Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e am: 280d269f01 am: 05f5afd834 am: 4b7b9dd4ab am: 6bff534f60 am: 18449e5999 am: f68fa658b6
...
am: 6796089700
2017-07-18 20:09:22 +00:00
Chenbo Feng
ead651e2a5
Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev am: f33518ff9d -s ours
...
am: 86df9aa8f2
2017-07-18 20:04:52 +00:00
Chenbo Feng
6796089700
Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e am: 280d269f01 am: 05f5afd834 am: 4b7b9dd4ab am: 6bff534f60 am: 18449e5999
...
am: f68fa658b6
2017-07-18 19:57:12 +00:00
Chenbo Feng
86df9aa8f2
Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev
...
am: f33518ff9d -s ours
Change-Id: Ic39c27bcdf2f117906a9927018036df3c15fd2c5
2017-07-18 19:53:33 +00:00
Chenbo Feng
4b1f47877f
Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab am: 120ebca195 am: 907ef28ed9 am: 579e5eb386 am: 3f96549bd1
...
am: 4ebc696249
2017-07-18 19:20:33 +00:00
Chenbo Feng
4ebc696249
Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab am: 120ebca195 am: 907ef28ed9 am: 579e5eb386
...
am: 3f96549bd1
2017-07-18 19:05:47 +00:00
Chenbo Feng
3f96549bd1
Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab am: 120ebca195 am: 907ef28ed9
...
am: 579e5eb386
Change-Id: I455baf9fb0b6db676a5a8a11971001f6aa57eddd
2017-07-18 18:55:49 +00:00
Chenbo Feng
907ef28ed9
Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab
...
am: 120ebca195
2017-07-18 18:35:41 +00:00
Chenbo Feng
120ebca195
Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1
...
am: 0545b99cab
2017-07-18 18:25:17 +00:00
Chenbo Feng
0545b99cab
Resolve merge conflicts of 2ce31b513f to nyc-dev
...
am: 3d166665b1
2017-07-18 18:14:42 +00:00
Chenbo Feng
26fccaf813
Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e am: 280d269f01 am: 05f5afd834 am: 4b7b9dd4ab am: 6bff534f60 am: 18449e5999 am: f68fa658b6
...
am: b5f135dd7d
2017-07-18 17:33:31 +00:00
Chenbo Feng
b5f135dd7d
Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e am: 280d269f01 am: 05f5afd834 am: 4b7b9dd4ab am: 6bff534f60 am: 18449e5999
...
am: f68fa658b6
2017-07-18 17:23:48 +00:00
Chenbo Feng
f68fa658b6
Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e am: 280d269f01 am: 05f5afd834 am: 4b7b9dd4ab am: 6bff534f60
...
am: 18449e5999
Change-Id: I56fe33eed13a8cdaa5078ca6b0e221dd37f18b44
2017-07-18 16:56:57 +00:00
Chenbo Feng
9a4f5e433e
Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev am: f33518ff9d
...
am: 700539bef5
2017-07-18 08:41:37 +00:00
Chenbo Feng
700539bef5
Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev
...
am: f33518ff9d
Change-Id: I055c066bcaaa004800db28d401fda54174ac5756
2017-07-18 08:33:10 +00:00
Chenbo Feng
b67b237853
resolve merge conflicts of 921e4b7e1c to oc-dev
...
Test: I solemnly swear I tested this conflict resolution.
run cts --module CtsNativeTestCases
Change-Id: I4c8764a00d30ab7ff94eff07870ec79c7d7bc67d
2017-07-17 21:54:20 -07:00
Chenbo Feng
3d166665b1
Resolve merge conflicts of 2ce31b513f to nyc-dev
...
Merged-In: Ie9ed8aa604be7c6ae364baa69922b89c006dea72
Test: I solemnly swear I tested this conflict resolution.
Bug: 62489688
2017-07-17 22:34:13 +00:00
Chenbo Feng
350ce2a27a
Merge "Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev am: 26339f2d77 -s ours" am: 175a223183 am: ff54e7910c
...
am: db65838ab1
Change-Id: I13a43bfc7a76812cbfffd3dbe95a16c62598a7cf
2017-07-17 21:35:30 +00:00
Chenbo Feng
6bff534f60
Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e am: 280d269f01 am: 05f5afd834
...
am: 4b7b9dd4ab
2017-07-17 21:26:53 +00:00
Chenbo Feng
ff54e7910c
Merge "Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev am: 26339f2d77 -s ours"
...
am: 175a223183
2017-07-17 21:23:04 +00:00
Chenbo Feng
4b7b9dd4ab
Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e am: 280d269f01
...
am: 05f5afd834
2017-07-17 21:22:51 +00:00
Chenbo Feng
a75b9016f1
Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev am: 26339f2d77
...
am: e2753dbabb
2017-07-17 21:18:55 +00:00
Android Merger
175a223183
Merge "Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev am: 26339f2d77 -s ours"
2017-07-17 21:17:07 +00:00
Chenbo Feng
fac19af0dd
Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev
...
am: 26339f2d77
2017-07-17 21:16:51 +00:00
Chenbo Feng
05f5afd834
Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e
...
am: 280d269f01
2017-07-17 21:16:26 +00:00
Chenbo Feng
e2753dbabb
Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev
...
am: 26339f2d77
2017-07-17 21:11:59 +00:00
Chenbo Feng
280d269f01
Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev
...
am: e37efbd57e
Change-Id: I40463d0c63199f3e93288a95c5ca6cc5eb52f500
2017-07-17 21:09:29 +00:00
Android Merger
26339f2d77
Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev
2017-07-17 21:02:57 +00:00
Chenbo Feng
3cd4cc6251
Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev
...
am: e37efbd57e
Change-Id: Ic7c13aa9c7abee40a812f6d7879a2d474f096d03
2017-07-17 21:02:46 +00:00
Chenbo Feng
997814263d
Resolve merge conflicts of 8482d8c85c to nougat-cts-dev
...
Test: I solemnly swear I tested this conflict resolution.
in cts-tf: run cts --module CtsNativeNetTestCases
Change-Id: I15253841993a79320dafa8669f0289c28f4ff4ea
2017-07-17 20:44:39 +00:00
Tina Zhou
576bfa9242
Merge "Add test to check sock addr in qtaguid ctrl file" into marshmallow-cts-dev am: 8482d8c85c am: 766fa6a623
...
am: 14a394402f
Change-Id: I5586b1f18e12f0022040de044ad1291b642dbf9e
2017-07-13 21:17:09 +00:00
Tina Zhou
766fa6a623
Merge "Add test to check sock addr in qtaguid ctrl file" into marshmallow-cts-dev
...
am: 8482d8c85c
Change-Id: I2fefc3090844c2ed9be8434ad0d0bcd11af13d08
2017-07-13 21:02:32 +00:00
Chenbo Feng
ba65ffc462
Add test to check sock addr in qtaguid ctrl file
...
This test verifies the socket address information is not leaked by
xt_qtaguid module inside the kernel. The sock_addr parsed from
proc/net/xt_qtaguid/ctrl file should always be 0
Bug: 62489688
Test: in cts-tf: run cts --package android.net.native
2017-06-28 13:47:30 -07:00
Android Build Merger (Role)
009a08f659
Merge "Merge "cts: skip wifi related tests if wifi is unsupported" into oc-dev am: 73a81b18cd am: 5383b735d5" into oc-dr1-dev-plus-aosp
2017-06-21 00:50:12 +00:00
Huihong Luo
186d91aacc
Merge "cts: skip wifi related tests if wifi is unsupported" into oc-dev am: 73a81b18cd
...
am: 5383b735d5
2017-06-21 00:49:40 +00:00
Huihong Luo
af9c8fa600
Merge "cts: skip wifi related tests if wifi is unsupported" into oc-dev am: 73a81b18cd
...
am: 7e31eb7564
2017-06-21 00:49:34 +00:00
Huihong Luo
5383b735d5
Merge "cts: skip wifi related tests if wifi is unsupported" into oc-dev
...
am: 73a81b18cd
2017-06-21 00:41:06 +00:00
Huihong Luo
7e31eb7564
Merge "cts: skip wifi related tests if wifi is unsupported" into oc-dev
...
am: 73a81b18cd
2017-06-21 00:41:01 +00:00
TreeHugger Robot
73a81b18cd
Merge "cts: skip wifi related tests if wifi is unsupported" into oc-dev
2017-06-21 00:31:47 +00:00
Android Build Merger (Role)
1357142005
Merge "Merge "WifiManagerTest: check softap mode supported" into oc-dev am: a2283cd312 am: 88d9f08c93" into oc-dr1-dev-plus-aosp
2017-06-20 17:32:44 +00:00
Rebecca Silberstein
8aae199384
Merge "WifiManagerTest: check softap mode supported" into oc-dev am: a2283cd312
...
am: 88d9f08c93
2017-06-20 17:30:26 +00:00
Rebecca Silberstein
9e49728771
Merge "WifiManagerTest: check softap mode supported" into oc-dev am: a2283cd312
...
am: db2fae593c
2017-06-20 17:30:25 +00:00
Rebecca Silberstein
db2fae593c
Merge "WifiManagerTest: check softap mode supported" into oc-dev
...
am: a2283cd312
2017-06-20 17:24:57 +00:00
Rebecca Silberstein
88d9f08c93
Merge "WifiManagerTest: check softap mode supported" into oc-dev
...
am: a2283cd312
2017-06-20 17:24:57 +00:00
Rebecca Silberstein
a2283cd312
Merge "WifiManagerTest: check softap mode supported" into oc-dev
2017-06-20 17:18:25 +00:00
Roshan Pius
1cb86cc234
Merge "WifiManagerTest: Set key mgmt field in testWifiManagerNetWork" into oc-dev am: 2cbd46c060
...
am: 54ddf823b9
2017-06-20 04:15:05 +00:00
Roshan Pius
90453f5a22
Merge "WifiManagerTest: Set key mgmt field in testWifiManagerNetWork" into oc-dev am: 2cbd46c060
...
am: f1253618dd
2017-06-20 04:12:02 +00:00
Roshan Pius
54ddf823b9
Merge "WifiManagerTest: Set key mgmt field in testWifiManagerNetWork" into oc-dev
...
am: 2cbd46c060
Change-Id: I9d0364acef9b989ae461e8241a3cd4d2e256c600
2017-06-20 04:07:32 +00:00
Roshan Pius
f1253618dd
Merge "WifiManagerTest: Set key mgmt field in testWifiManagerNetWork" into oc-dev
...
am: 2cbd46c060
Change-Id: I1736f8f269ba2f4d53af9cd0a7c493d5adc99902
2017-06-20 04:07:32 +00:00
Roshan Pius
929683c04f
WifiManagerTest: Set key mgmt field in testWifiManagerNetWork
...
By default |allowedKeyMgmt| is set to WPA_PSK, however the
|preSharedKey| is not set for this WifiConfiguration. So, the new
|validate| method added in ag/2339612, will reject the network update
(rightly so, because it's an invalid configuration). So, set the key
mgmt to |NONE| to indicate that this is an open network and hence does
not need the |preSharedKey| field.
Bug: 62418044
Test: Failing test passes now.
Change-Id: If979b909f2fb7d7b4e2626b57eff407ba6a019ab
(cherry picked from commit c7f4afa63708d898b7c0d0562b8b3ee3608114fe)
2017-06-19 21:13:11 +00:00
