Etan Cohen
294f9ae45b
Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0
...
am: 8e699c86fc
Change-Id: I7860a70a1cb206f4af24441886efa2cb9512b3b5
2017-10-24 18:02:30 +00:00
Etan Cohen
8e699c86fc
Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev
...
am: d5c00ceee0
Change-Id: I9b42b412355a641f2bb8a06f031fced7575bab44
2017-10-24 17:57:29 +00:00
Treehugger Robot
d5c00ceee0
Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev
2017-10-24 17:50:46 +00:00
Etan Cohen
591518f378
[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network
...
Before calling the testAddPasspointConfigWithCertCredential
we need to check number of network already present in device
Bug: 67630919
Test: android.server.cts.CtsNetTestCases, WifiManagerTest
Change-Id: If643ab7bde760a65e9a5b1e9d47af53378a178fd
2017-10-23 23:07:59 +00:00
Sudheer Shanka
1608a09e47
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3 am: 662e13b57a am: 46f8aa6d48 am: 7cbb2f7587 am: b3b2ee88cd am: c4e9bdc085 -s ours
...
am: 8ca874ff80 -s ours
Change-Id: I3ddea2408f094af97ff024109ab3034c53f58608
2017-09-07 18:51:41 +00:00
Sudheer Shanka
8ca874ff80
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3 am: 662e13b57a am: 46f8aa6d48 am: 7cbb2f7587 am: b3b2ee88cd
...
am: c4e9bdc085 -s ours
Change-Id: I1ddc2ab2fb8c80d9455b7ee15e7fa4e929517c7a
2017-09-07 18:43:52 +00:00
Sudheer Shanka
ad5a21d247
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b am: f0bc6efb5e am: be2d3c2871 am: c0c353f6d2 -s ours
...
am: 384309dea0 -s ours
Change-Id: I550af6b29aef745ff10c7592de7f468b6a8859ff
2017-09-07 18:43:45 +00:00
Sudheer Shanka
384309dea0
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b am: f0bc6efb5e am: be2d3c2871
...
am: c0c353f6d2 -s ours
Change-Id: Id8af45c896241c03d9ca43f9cd5825e77ffe6563
2017-09-07 18:35:44 +00:00
Sudheer Shanka
8a8d41cb6e
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b -s ours am: b411a9d3c1 -s ours
...
am: 054a3b98cb -s ours
Change-Id: I14f77d3571e1411cc7f233a7405c9757ead26396
2017-09-07 18:29:41 +00:00
Sudheer Shanka
b3b2ee88cd
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3 am: 662e13b57a am: 46f8aa6d48
...
am: 7cbb2f7587
Change-Id: Idc1174d25aecef3bb5461d22a6d2bcf3fdf6bed3
2017-09-07 18:29:40 +00:00
Sudheer Shanka
7cbb2f7587
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3 am: 662e13b57a
...
am: 46f8aa6d48
Change-Id: If6fb0012849a0b95344fa4ed5f2e3985340a03a1
2017-09-07 18:25:15 +00:00
Sudheer Shanka
be2d3c2871
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b
...
am: f0bc6efb5e
Change-Id: Ic20530cdbae02daf1133500e2778b8829331332b
2017-09-07 18:24:22 +00:00
Sudheer Shanka
054a3b98cb
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b -s ours
...
am: b411a9d3c1 -s ours
Change-Id: Iaaaa496a0b092e48d7acf7901a40e9767efedba6
2017-09-07 18:23:09 +00:00
Sudheer Shanka
46f8aa6d48
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3
...
am: 662e13b57a
Change-Id: I0d070bfbe19666f77b9ae21c19893f776389fac0
2017-09-07 18:20:35 +00:00
Sudheer Shanka
b411a9d3c1
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev
...
am: b5abc8f89b -s ours
Change-Id: I6e63b41e0a0c499aeeab069da4666c4f42a18fc9
2017-09-07 18:19:13 +00:00
Sudheer Shanka
f0bc6efb5e
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev
...
am: b5abc8f89b
Change-Id: Ic3aee8310d6250d15a5414640dbd35cb66a7c18c
2017-09-07 18:17:21 +00:00
Sudheer Shanka
662e13b57a
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev
...
am: 203361a0c3
Change-Id: I7bd246e79792960c53e12c166a255eabe7f428ed
2017-09-07 18:11:26 +00:00
Android Merger
b5abc8f89b
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev
2017-09-07 18:08:35 +00:00
Sudheer Shanka
9418ecdc40
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev
...
am: 203361a0c3
Change-Id: Ifbd3594524de6fc45cb199345715794f9869c9d6
2017-09-07 18:08:27 +00:00
Sudheer Shanka
07e00f7523
Increase timeout for ordered broadcast response.
...
Bug: 65269531
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \
com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Merged-In: Ibdb84048b04405f234aa5ad9124eb70e9e592498
Merged-In: I99668396abcf7421cd7ffb9118e309aaecb80f07
Change-Id: I6f1de7ccc8d4164dc6f770b54863c04bb7d9e62e
2017-09-05 14:56:04 -07:00
Bjoern Johansson
68842e0e90
Skip WifiManager tests if WiFi is not supported
...
am: d4c2d2aca3
Change-Id: I87d6e927e5b739db343b013c212fc9fb1e076a98
2017-08-23 18:12:26 +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
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
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
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
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
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
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
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
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
6bff534f60
Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e am: 280d269f01 am: 05f5afd834
...
am: 4b7b9dd4ab
Change-Id: Ic0264bee4a49e54159b0251920d8481a6fbd1152
2017-07-17 21:26:53 +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
Change-Id: I0c53f19be9898d206c8b5c3ba4784595d509925d
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
Change-Id: Iba9cee9b7ffc67fa836e58eb547dd00b3b491321
2017-07-17 21:18:55 +00:00
Chenbo Feng
05f5afd834
Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e
...
am: 280d269f01
Change-Id: Ic1e80a7b0345cb20180cbe6faed9ca803cabcb60
2017-07-17 21:16:26 +00:00