Bill Yi
7981475dae
Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE am: cbc75fa643 -s ours am: 7f71a70fd9 -s ours am: 81257a1750
...
am: d2cc39174c
2017-09-15 22:59:07 +00:00
Bill Yi
d2cc39174c
Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE am: cbc75fa643 -s ours am: 7f71a70fd9 -s ours
...
am: 81257a1750
2017-09-15 22:52:50 +00:00
Bill Yi
81257a1750
Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE am: cbc75fa643 -s ours
...
am: 7f71a70fd9
2017-09-15 21:16:06 +00:00
Bill Yi
7f71a70fd9
Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE
...
am: cbc75fa643
2017-09-15 21:11:07 +00:00
Bill Yi
cbc75fa643
Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE
...
Change-Id: I5a20ec8986f2bfc810cec42ca7b33310aba337a4
2017-09-15 13:55:36 -07:00
Etan Cohen
3639d7439e
Merge "Merge "[AWARE][CTS] Check for location setting for test needing to disable Wi-Fi" into oc-dev am: ba16d61c91" am: 98792d616b am: 507654d6ae am: 310a56dcb0
...
am: 1c97094149
2017-09-15 12:12:09 +00:00
Chenbo Feng
564d89f410
Merge "Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab am: 120ebca195 am: 907ef28ed9 am: 579e5eb386 am: 3f96549bd1" am: c3d81857a5 am: 6fe814f14b am: a953e3229c
...
am: 8f3f8cb7fd
2017-09-15 05:58:09 +00:00
Chenbo Feng
03f2a0ea61
Merge "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: 46acd158a2 am: 89e5b633c7 am: 4f23ba69d9
...
am: a54608a11a
2017-09-15 05:46:56 +00:00
Chenbo Feng
0f78719a77
Merge "Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev am: f33518ff9d" am: 0fb575dc69 am: 4ee9600280 am: 1b193f4735
...
am: f753028e01
2017-09-15 05:19:27 +00:00
Jeff Sharkey
242935cb85
Merge "Fix flaky CtsHostsideNetworkTests." into oc-mr1-dev am: 91b52b4043
...
am: be3000bc35
2017-09-15 04:17:16 +00:00
Etan Cohen
1c97094149
Merge "Merge "[AWARE][CTS] Check for location setting for test needing to disable Wi-Fi" into oc-dev am: ba16d61c91" am: 98792d616b am: 507654d6ae
...
am: 310a56dcb0
2017-09-15 03:16:47 +00:00
Etan Cohen
310a56dcb0
Merge "Merge "[AWARE][CTS] Check for location setting for test needing to disable Wi-Fi" into oc-dev am: ba16d61c91" am: 98792d616b
...
am: 507654d6ae
2017-09-15 02:57:02 +00:00
Etan Cohen
507654d6ae
Merge "Merge "[AWARE][CTS] Check for location setting for test needing to disable Wi-Fi" into oc-dev am: ba16d61c91"
...
am: 98792d616b
Change-Id: I1882f7e73325c4b938f22b2f7e29d203117819b9
2017-09-15 02:43:55 +00:00
Etan Cohen
04038eb317
Merge "[AWARE][CTS] Check for location setting for test needing to disable Wi-Fi" into oc-dev
...
am: ba16d61c91
Change-Id: If02188d1840095be927a18b66296910c4ec7e387
2017-09-14 22:59:05 +00:00
Chenbo Feng
8f3f8cb7fd
Merge "Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab am: 120ebca195 am: 907ef28ed9 am: 579e5eb386 am: 3f96549bd1" am: c3d81857a5 am: 6fe814f14b
...
am: a953e3229c
2017-09-14 22:54:43 +00:00
Chenbo Feng
a953e3229c
Merge "Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab am: 120ebca195 am: 907ef28ed9 am: 579e5eb386 am: 3f96549bd1" am: c3d81857a5
...
am: 6fe814f14b
2017-09-14 22:35:10 +00:00
Chenbo Feng
6fe814f14b
Merge "Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab am: 120ebca195 am: 907ef28ed9 am: 579e5eb386 am: 3f96549bd1"
...
am: c3d81857a5
Change-Id: Ifff65ca6a4ca26dd0bb5defac2a965952dee08fe
2017-09-14 22:23:19 +00:00
Chenbo Feng
a54608a11a
Merge "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: 46acd158a2 am: 89e5b633c7
...
am: 4f23ba69d9
2017-09-14 22:22:31 +00:00
Chenbo Feng
4f23ba69d9
Merge "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: 46acd158a2
...
am: 89e5b633c7
2017-09-14 22:15:39 +00:00
Chenbo Feng
89e5b633c7
Merge "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: 46acd158a2
Change-Id: Id99b60b98e06a43c2e9ad645ee0e50b5395a8bff
2017-09-14 22:11:24 +00:00
Chenbo Feng
85de5d94bc
Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab am: 120ebca195 am: 907ef28ed9 am: 579e5eb386
...
am: 3f96549bd1
2017-09-14 21:58:00 +00:00
Chenbo Feng
880ad913b8
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-09-14 21:55:29 +00:00
Chenbo Feng
f753028e01
Merge "Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev am: f33518ff9d" am: 0fb575dc69 am: 4ee9600280
...
am: 1b193f4735
2017-09-14 17:49:26 +00:00
Chenbo Feng
1b193f4735
Merge "Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev am: f33518ff9d" am: 0fb575dc69
...
am: 4ee9600280
2017-09-14 17:39:00 +00:00
Chenbo Feng
4ee9600280
Merge "Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev am: f33518ff9d"
...
am: 0fb575dc69
Change-Id: I1c5312b51f851d7a70b985a980c128622e1b68e6
2017-09-14 17:27:47 +00:00
Jeff Sharkey
be3000bc35
Merge "Fix flaky CtsHostsideNetworkTests." into oc-mr1-dev
...
am: 91b52b4043
Change-Id: I8177cc215297566af2fb9ac206c5c425071fd3aa
2017-09-14 16:56:06 +00:00
Chenbo Feng
72ea1b2420
Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev
...
am: f33518ff9d
Change-Id: I705950d7d620ac21cc74c2584c0e3256f17af15e
2017-09-14 03:55:19 +00:00
Sudheer Shanka
459e28159c
Fix flaky CtsHostsideNetworkTests.
...
'set metered-network' adb command is not blocking, it doesn't
wait for the network to be marked as metered. Updated test
to sleep and poll for metered status.
Bug: 64274313
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests \
-t com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Change-Id: Ide3e1633167979bdca912c1c299ad17d988b537e
2017-09-13 18:17:01 -07:00
Sudheer Shanka
d74aab502f
Merge "Add extra logging when the test fails." into oc-mr1-dev am: 27547e6446
...
am: c7779d69ab
2017-09-09 00:46:22 +00:00
Sudheer Shanka
c7779d69ab
Merge "Add extra logging when the test fails." into oc-mr1-dev
...
am: 27547e6446
2017-09-08 23:52:33 +00:00
Sudheer Shanka
27547e6446
Merge "Add extra logging when the test fails." into oc-mr1-dev
2017-09-08 23:12:44 +00:00
Sudheer Shanka
518999df34
Add extra logging when the test fails.
...
When the test fails, dump network_management and netpolicy
services to help in debugging.
Bug: 64274313
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests \
-t com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Change-Id: I76287de2c7cd6f394af9768a69e2c0fabba3be25
2017-09-07 15:36:08 -07:00
Sudheer Shanka
f03228ab2f
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: 314d003540 -s ours
...
am: bcaf1bf849
2017-09-07 19:15:06 +00:00
Sudheer Shanka
3333ae92fc
Merge "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: e0ebf2197b -s ours" into oc-mr1-dev-plus-aosp
...
am: 319693bce2
2017-09-07 19:13:07 +00:00
Sudheer Shanka
8e613700a1
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 -s ours
...
am: cd70b4a721
2017-09-07 19:09:00 +00:00
Sudheer Shanka
bcaf1bf849
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: 314d003540
2017-09-07 19:05:23 +00:00
Sudheer Shanka
a1326f86e0
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
...
am: f7a8a679f8
2017-09-07 19:04:01 +00:00
Android Build Merger (Role)
319693bce2
Merge "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: e0ebf2197b -s ours" into oc-mr1-dev-plus-aosp
2017-09-07 19:03:30 +00:00
Sudheer Shanka
459c05d27a
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: e0ebf2197b
2017-09-07 19:02:10 +00:00
Sudheer Shanka
a31cec4d5e
Merge "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 -s ours" into oc-mr1-dev-plus-aosp
...
am: 71a110195b -s ours
Change-Id: I32f0db7436e08e3f61312323d9317d2698b284b6
2017-09-07 19:01:53 +00:00
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
314d003540
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:46 +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
98b98799c3
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 -s ours
...
am: 2da1dde301
2017-09-07 18:52:49 +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
e0ebf2197b
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:19 +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
