Commit Graph

1619 Commits

Author SHA1 Message Date
Bjoern Johansson
bd7f2904d9 Skip WifiManager tests if WiFi is not supported
Some of the WifiManager tests assumed that WiFi is always supported.
This is not true for all devices, for example the Android emulator, and
is not a requirement in the CDD.

BUG: 37633976
Test: Successfully ran 'run cts -m CtsNetTestCases'
Change-Id: Ia6d62e8d2b6e0b0c2ef2fafd50529e722e4419e4
2017-08-17 17:14:40 -07:00
Sudheer Shanka
a30a1edf9f Add location permission to netpolicy test app.
As part of the test, wifi ssid needs to be extracted which
is guarded by ACCESS_COARSE_LOCATION permission.

Bug: 64274313
Test: cts-tradefed run singleCommand cts-dev --module CtsHostsideNetworkTests -t \
      com.android.cts.net.HostsideRestrictBackgroundNetworkTests

Change-Id: I5c23b11dc1bf26a672bc1454ff1e2594935d43d8
2017-08-16 10:17:59 -07:00
shreerag
7f06181c86 Merge "No longer using specific watch device idle settings" into oc-dev am: 8bde47ae82
am: eb2c021f93

Change-Id: Iff4af17accb81c3111c0a7517dfcb295858ad48f
2017-08-10 00:05:26 +00:00
shreerag
eb2c021f93 Merge "No longer using specific watch device idle settings" into oc-dev
am: 8bde47ae82

Change-Id: I46f8f4bdfea7ae4f75119226cbaa100365a260db
2017-08-09 23:58:26 +00:00
TreeHugger Robot
8bde47ae82 Merge "No longer using specific watch device idle settings" into oc-dev 2017-08-09 23:44:19 +00:00
Lorenzo Colitti
b0a7fc43f3 Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9 am: 80c62eb79b am: d4df358e42 am: 929efe5914 am: c324d8efcc
am: 8331ccda31

Change-Id: I4b68b8229a71b49a65ed519e0239fa6ffbf85105
2017-08-09 17:16:19 +00:00
Lorenzo Colitti
8331ccda31 Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9 am: 80c62eb79b am: d4df358e42 am: 929efe5914
am: c324d8efcc

Change-Id: I2d471b52d69e8af0eae9e0548f58afeeabff9f3f
2017-08-09 16:53:47 +00:00
Lorenzo Colitti
c324d8efcc Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9 am: 80c62eb79b am: d4df358e42
am: 929efe5914

Change-Id: Id08eca6a250dee0c809267b7e3c79b9bb7170f3b
2017-08-09 16:47:20 +00:00
Lorenzo Colitti
d4df358e42 Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9
am: 80c62eb79b

Change-Id: Iee5219bc701a3049340d49f4fb33cc1340325957
2017-08-09 16:35:45 +00:00
Lorenzo Colitti
80c62eb79b Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev
am: bfabfe75f9

Change-Id: If02ea4f12870acb3e5e1bce9e9ddbc42c0fd05f0
2017-08-09 16:29:49 +00:00
Treehugger Robot
bfabfe75f9 Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev 2017-08-09 16:17:22 +00:00
shreerag
f99d8d82b4 No longer using specific watch device idle settings
Bug: 28091250
Change-Id: Id57c5a638f5a10367d13f6353ea3212745a3f06e
2017-08-07 23:40:25 +00:00
Etan Cohen
c4043aebc6 Merge "[AWARE][CTS] Check for location setting for test needing to disable Wi-Fi" into oc-dev am: ba16d61c91
am: 9cf74ade23

Change-Id: I39b679393d97288ac80eb73ca22f63466bc85a9e
2017-07-29 20:16:46 +00:00
Etan Cohen
9cf74ade23 Merge "[AWARE][CTS] Check for location setting for test needing to disable Wi-Fi" into oc-dev
am: ba16d61c91

Change-Id: Iaee56d95f394116b731e8092ad2507eb113bb50c
2017-07-29 20:11:16 +00:00
Etan Cohen
ba1f56050f [AWARE][CTS] Check for location setting for test needing to disable Wi-Fi
Disabling Wi-Fi API which is available to CTS only disables the
infrastructure mode (association to an AP). This disables the Wi-Fi
chip (HAL/driver/firmware) only if location scanning is disabled,
otherwise the chip is still enabled.

The failing CTS Wi-Fi Aware test relied on disabling the Wi-Fi chip.
This cannot be done from CTS. Added a check for location scan setting
and skip the test if enabled.

Cannot fail and require the tester to disable location scans since other
CTS tests require it to be enabled.

Bug: 64125460
Test: run cts with and without location scans
Change-Id: I0582926dbf854c14b57dcdeb383db9b5f2a353a2
2017-07-28 22:30:33 +00:00
Chenbo Feng
526e6ca600 Merge "Add test to check sock addr in qtaguid ctrl file" into oc-dr1-dev am: c27e548346
am: c50605ed51

Change-Id: Ic5ac97d78af2d25cb9e35ee3cf82695fa64aaed6
2017-07-19 00:29:21 +00:00
Chenbo Feng
a6d4fe32f6 Merge "Rename the native test file" into oc-dr1-dev am: f00fd5886b
am: 9357731f9e

Change-Id: Idc8516cab9271cb2349ddf61a1e45b3866f52f1a
2017-07-19 00:28:27 +00:00
Chenbo Feng
c50605ed51 Merge "Add test to check sock addr in qtaguid ctrl file" into oc-dr1-dev
am: c27e548346

Change-Id: I8627db8fc0a811294bf8cf42939c0189d2041aa9
2017-07-19 00:00:21 +00:00
Chenbo Feng
9357731f9e Merge "Rename the native test file" into oc-dr1-dev
am: f00fd5886b

Change-Id: I10ce840ec4fb2aea62730cbcff189ecdea3e9ee9
2017-07-18 23:59:34 +00:00
TreeHugger Robot
c27e548346 Merge "Add test to check sock addr in qtaguid ctrl file" into oc-dr1-dev 2017-07-18 23:49:08 +00:00
TreeHugger Robot
f00fd5886b Merge "Rename the native test file" into oc-dr1-dev 2017-07-18 23:48:55 +00:00
Chenbo Feng
48c9d6176b Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab am: 120ebca195 am: 907ef28ed9 am: 579e5eb386 am: 3f96549bd1 am: 611e909387
am: 1588b5afe0

Change-Id: Ib92d7051a911f29738be0d2d25e7d3965e2f0796
2017-07-18 20:30:09 +00:00
Chenbo Feng
e36936b285 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
am: 833dc5bd2c

Change-Id: Icdca94704fceeeb23408445b91a8bb868071e940
2017-07-18 20:20:07 +00:00
Chenbo Feng
1588b5afe0 Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab am: 120ebca195 am: 907ef28ed9 am: 579e5eb386 am: 3f96549bd1
am: 611e909387

Change-Id: I91b743e3ad8c4806c6619c69b90ddebee68a8160
2017-07-18 20:19:01 +00:00
Chenbo Feng
cfa7f74630 Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev am: f33518ff9d -s ours am: 86df9aa8f2 -s ours
am: ead651e2a5

Change-Id: I6393a50d98affc5b84befd19aa4312abf4604b3e
2017-07-18 20:12:46 +00:00
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

Change-Id: I32acd045177fb8247340ae3a939bbb97137db3b1
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  -s ours

Change-Id: I811a64c28b10aa6356f1fb3a40a3e3ac35f5aac4
2017-07-18 20:04:52 +00:00
Chenbo Feng
611e909387 Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab am: 120ebca195 am: 907ef28ed9 am: 579e5eb386
am: 3f96549bd1

Change-Id: I43a65e8ff88b8dc8478cf13a61fe7704a6f97e4c
2017-07-18 20:02:15 +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

Change-Id: I398a3ca94b6d255014e8ffa1ce71660e968e960d
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
0f6014e112 Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab am: 120ebca195 am: 907ef28ed9 am: 579e5eb386 am: 3f96549bd1 am: 4ebc696249
am: 4b1f47877f

Change-Id: I1f6dafded55445cec1ebc6af8e48976dcee8ac22
2017-07-18 19:26:04 +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

Change-Id: Ie41d9c5aa84fb6cc0f714c2ea76f67a6a121c2db
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

Change-Id: I6f0bf826d20ae8d59636074292b49e3c869c45af
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

Change-Id: I19d5cb4167cda461b439a6d17cd1bca9521da222
2017-07-18 18:35:41 +00:00
Chenbo Feng
120ebca195 Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1
am: 0545b99cab

Change-Id: Id42297c51419c1c6cfe35222648b66015c3e8887
2017-07-18 18:25:17 +00:00
Chenbo Feng
0545b99cab Resolve merge conflicts of 2ce31b513f to nyc-dev
am: 3d166665b1

Change-Id: I218debd55328e87f59aaa387d0ebf4520787bc82
2017-07-18 18:14:42 +00:00
Chenbo Feng
a4039ad8df 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 --module CtsNativeNetTestCases

Change-Id: Ie9ed8aa604be7c6ae364baa69922b89c006dea72
2017-07-18 10:49:57 -07:00
Chenbo Feng
f048e836c0 Rename the native test file
Since more test is added to the qtaguid native test file, the previous
name is not suitable for representing the purpose of this test file.
Rename it to NativeQtaguidTest.cpp.

Bug: 62489688
Test: in cts-tf: run cts --module CtsNativeNetTestCases
Change-Id: Id64591db060c7d0178602517fd703dab586bfb5f
2017-07-18 10:49:11 -07:00
Chenbo Feng
c6b28f4a84 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
am: 26fccaf813

Change-Id: I0f193c9e2c649c496f170c9932ae2bb0679ccea3
2017-07-18 17:48:35 +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

Change-Id: I4a9eba24910a0e1d0f7dac862a8cc574e3a63016
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

Change-Id: Id4d3f59ac994a495ca31475b4d7a1a55ed592293
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
60632795c7 Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev am: f33518ff9d am: 700539bef5
am: 9a4f5e433e

Change-Id: I4b6b9d3aff5353e56f623e905bc91fb85f296131
2017-07-18 08:52:44 +00:00
Chenbo Feng
9a4f5e433e Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev am: f33518ff9d
am: 700539bef5

Change-Id: I5087a5bd529404b2b5598cce46ba1b590caccfd8
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
b8feb9ac3d 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
am: 350ce2a27a

Change-Id: I7c5d2ede2376b1808a66d7568ac1dfb202b5ece1
2017-07-17 21:42:00 +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