Sudheer Shanka
cd70b4a721
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 am: 1608a09e47 -s ours
...
am: eda0e85f99
2017-09-07 19:00:48 +00:00
Android Build Merger (Role)
f7a8a679f8
Merge "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 am: 8a8d41cb6e -s ours am: 1c3be623ba -s ours" into oc-mr1-dev-plus-aosp
2017-09-07 18:57:38 +00:00
Sudheer Shanka
eda0e85f99
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
...
am: 1608a09e47
2017-09-07 18:56:43 +00:00
Sudheer Shanka
4e780891d4
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 am: 8a8d41cb6e -s ours
...
am: 1c3be623ba
2017-09-07 18:56:22 +00:00
Sudheer Shanka
34c9a6a2ef
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 am: ad5a21d247 -s ours
...
am: 2cdc59452a
2017-09-07 18:54:46 +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
2017-09-07 18:51:41 +00:00
Sudheer Shanka
2cdc59452a
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
...
am: ad5a21d247
2017-09-07 18:50:12 +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
2da1dde301
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 am: 8a8d41cb6e -s ours
...
am: adcf5350c0
2017-09-07 18:43:47 +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
2017-09-07 18:43:45 +00:00
Sudheer Shanka
1c3be623ba
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
...
am: 8a8d41cb6e
2017-09-07 18:41:58 +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
adcf5350c0
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
...
am: 8a8d41cb6e
2017-09-07 18:35:42 +00:00
Sudheer Shanka
5038cbb7e8
Merge "Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b -s ours" am: 6a0cb56e57 -s ours am: d832f09d2b -s ours
...
am: 50340e0112 -s ours
Change-Id: I9e4a597a0a2e39b591f20b022e294ad496e49938
2017-09-07 18:31:47 +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
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
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
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
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
2017-09-07 18:23:09 +00:00
Sudheer Shanka
d832f09d2b
Merge "Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b -s ours"
...
am: 6a0cb56e57
2017-09-07 18:21:17 +00:00
Sudheer Shanka
46f8aa6d48
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3
...
am: 662e13b57a
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
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
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
6a0cb56e57
Merge "Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b -s ours"
2017-09-07 18:10:38 +00:00
Sudheer Shanka
516c8c9872
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev
...
am: b5abc8f89b
2017-09-07 18:10:25 +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
Sudheer Shanka
0f3ddec924
Merge "Add notification listener using the new shell command." into oc-mr1-dev
...
am: a322dd9920
Change-Id: I3cc5f6cb367ebf17e032d2ed6c91cb9f6eaffa75
2017-09-01 23:10:14 +00:00
Sudheer Shanka
46ec0e97b4
Add notification listener using the new shell command.
...
Adding notification listener by updating secure setting has
been deprecated.
Fixes: 65245599
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \
com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Change-Id: I98dbff45bffed592cba2cd964f1a148450a1197d
2017-08-31 17:42:41 -07:00
Bjoern Johansson
f77917a13e
Skip WifiManager tests if WiFi is not supported am: d4c2d2aca3 am: 68842e0e90
...
am: 366172dea8
2017-08-23 18:35:54 +00:00
Bjoern Johansson
39c5b899a0
Merge "Skip WifiManager tests if WiFi is not supported am: d4c2d2aca3 am: 632418c11c" into oc-dr1-dev-plus-aosp
...
am: f7d8c8a448
2017-08-23 18:31:25 +00:00
Bjoern Johansson
85b2788bca
Skip WifiManager tests if WiFi is not supported am: d4c2d2aca3 am: 68842e0e90
...
am: f4cc24488c
2017-08-23 18:28:29 +00:00
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
366172dea8
Skip WifiManager tests if WiFi is not supported am: d4c2d2aca3
...
am: 68842e0e90
2017-08-23 18:18: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
Bjoern Johansson
1450c12cc3
Merge "Skip WifiManager tests if WiFi is not supported" into oc-mr1-dev
...
am: d6b3cb0682
Change-Id: Ib3a43925e79cba6406cad7b9bc5a93716ea9e46a
2017-08-23 02:34:18 +00:00
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
c1887840f0
Merge "Add location permission to netpolicy test app." into oc-mr1-dev
...
am: 97cbea8559
Change-Id: If98dd7fa8426281498ea30ca5310dcf8bf6a6030
2017-08-16 22:22:16 +00: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
2e03f5ab8b
Merge "No longer using specific watch device idle settings" into oc-dev am: 8bde47ae82 am: eb2c021f93
...
am: 94206d5cad
2017-08-10 00:34:09 +00:00
shreerag
f4626a7706
Merge "No longer using specific watch device idle settings" into oc-dev am: 8bde47ae82 am: 940696d63a
...
am: be05af9c47
2017-08-10 00:33:05 +00:00
shreerag
290cc9306c
Merge "No longer using specific watch device idle settings" into oc-dev am: 8bde47ae82 am: eb2c021f93
...
am: 7f06181c86
2017-08-10 00:13:58 +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
7f06181c86
Merge "No longer using specific watch device idle settings" into oc-dev am: 8bde47ae82
...
am: eb2c021f93
2017-08-10 00:05:26 +00:00
