Android Build Merger (Role)
f7d8c8a448
Merge "Skip WifiManager tests if WiFi is not supported am: d4c2d2aca3 am: 632418c11c" into oc-dr1-dev-plus-aosp
2017-08-23 18:20:55 +00:00
Bjoern Johansson
21fc213b66
Skip WifiManager tests if WiFi is not supported am: d4c2d2aca3
...
am: 632418c11c
2017-08-23 18:18:55 +00:00
Bjoern Johansson
f4cc24488c
Skip WifiManager tests if WiFi is not supported am: d4c2d2aca3
...
am: 68842e0e90
2017-08-23 18:18:52 +00:00
Bjoern Johansson
68842e0e90
Skip WifiManager tests if WiFi is not supported
...
am: d4c2d2aca3
2017-08-23 18:12:26 +00:00
Bjoern Johansson
632418c11c
Skip WifiManager tests if WiFi is not supported
...
am: d4c2d2aca3
2017-08-23 18:12:22 +00:00
Bjoern Johansson
d4c2d2aca3
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
(cherry picked from commit 9703adffd5e3bf85e482cdac45a1147caff4ac3d)
2017-08-23 15:52:48 +00:00
shreerag
94206d5cad
Merge "No longer using specific watch device idle settings" into oc-dev am: 8bde47ae82
...
am: eb2c021f93
2017-08-10 00:05:26 +00:00
shreerag
be05af9c47
Merge "No longer using specific watch device idle settings" into oc-dev am: 8bde47ae82
...
am: 940696d63a
2017-08-10 00:03:01 +00:00
shreerag
eb2c021f93
Merge "No longer using specific watch device idle settings" into oc-dev
...
am: 8bde47ae82
2017-08-09 23:58:26 +00:00
shreerag
940696d63a
Merge "No longer using specific watch device idle settings" into oc-dev
...
am: 8bde47ae82
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
Android Build Merger (Role)
172b195839
Merge "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: 1a81908450" into oc-dr1-dev-plus-aosp
2017-08-09 17:05:50 +00:00
Lorenzo Colitti
9448a9e068
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
2017-08-09 17:04:55 +00:00
Lorenzo Colitti
8ac9ae64a7
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: 1a81908450
2017-08-09 17:04:55 +00:00
Lorenzo Colitti
1a81908450
Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9 am: 80c62eb79b am: d4df358e42 am: 929efe5914
...
am: c324d8efcc
2017-08-09 16:53:48 +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
2017-08-09 16:53:47 +00:00
Lorenzo Colitti
dd9617a6a7
Merge "Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9" am: 1e524c5db2 am: ad86c0342e
...
am: 62cc540c27
2017-08-09 16:53:25 +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
62cc540c27
Merge "Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9" am: 1e524c5db2
...
am: ad86c0342e
2017-08-09 16:47:16 +00:00
Lorenzo Colitti
ad86c0342e
Merge "Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9"
...
am: 1e524c5db2
2017-08-09 16:36:01 +00:00
Lorenzo Colitti
d4df358e42
Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9
...
am: 80c62eb79b
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
2017-08-09 16:29:49 +00:00
Android Merger
1e524c5db2
Merge "Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9"
2017-08-09 16:24:14 +00:00
Lorenzo Colitti
9196e62bb2
Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev
...
am: bfabfe75f9
2017-08-09 16:24:03 +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
Android Build Merger (Role)
00cdda008d
Merge "Merge "[AWARE][CTS] Check for location setting for test needing to disable Wi-Fi" into oc-dev am: ba16d61c91 am: 9cf74ade23" into oc-dr1-dev-plus-aosp
2017-07-29 20:17:41 +00:00
Etan Cohen
08cfd4e236
Merge "[AWARE][CTS] Check for location setting for test needing to disable Wi-Fi" into oc-dev am: ba16d61c91
...
am: daf01a0a1f
2017-07-29 20:16:46 +00:00
Etan Cohen
7e96f0684d
Merge "[AWARE][CTS] Check for location setting for test needing to disable Wi-Fi" into oc-dev am: ba16d61c91
...
am: 9cf74ade23
2017-07-29 20:16:45 +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
daf01a0a1f
Merge "[AWARE][CTS] Check for location setting for test needing to disable Wi-Fi" into oc-dev
...
am: ba16d61c91
Change-Id: I40dce2dfc27cb8cbbbbc61bf19f12d096a469d55
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
c50605ed51
Merge "Add test to check sock addr in qtaguid ctrl file" into oc-dr1-dev
...
am: c27e548346
2017-07-19 00:00:21 +00:00
Chenbo Feng
9357731f9e
Merge "Rename the native test file" into oc-dr1-dev
...
am: f00fd5886b
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
1588b5afe0
Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab am: 120ebca195 am: 907ef28ed9 am: 579e5eb386 am: 3f96549bd1
...
am: 611e909387
2017-07-18 20:19:01 +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
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
611e909387
Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab am: 120ebca195 am: 907ef28ed9 am: 579e5eb386
...
am: 3f96549bd1
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
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
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
