Roshan Pius
e952b1302c
Merge "WifiManagerTest: Don't assert for isScanAlwaysAvailable" into pi-dev
...
am: 9ead90f773
Change-Id: If7b07dff9747a43025c480c4f2304f73aa39688d
2018-04-19 13:34:12 -07:00
Roshan Pius
e549804b9d
WifiManagerTest: Don't assert for isScanAlwaysAvailable
...
This may not be true on all platforms (Android wear for example don't
want to support this functionality)
Bug: 78242827
Test: atest android.net.wifi.cts
Change-Id: I73ab8cd31a9b4a29bd47f8e47957c921a0b16fa3
2018-04-18 15:48:33 -07:00
Etan Cohen
21ca62b0bf
Merge "[RTT] Increase CTS coverage" into pi-dev
...
am: 7daa6af30d
Change-Id: I8bbf8ad2b4479c8103d13ad086df4265c573049d
2018-04-14 19:05:53 -07:00
Etan Cohen
7530899eb8
[RTT] Increase CTS coverage
...
Increase CTS coverage by utilizing additional methods.
Bug: 77915947
Test: atest WifiRttTest
Change-Id: Ibc560aafb317fb27fd969b8899cc49c5cd7a979f
2018-04-13 15:17:15 -07:00
Roshan Pius
98090458b3
Merge "ScanResultTest: Retry scan attempts on failure" into pi-dev
...
am: 1026eaee92
Change-Id: I801ab24ef5fc0a9d8c64b5e156c363dc3441e71d
2018-04-12 17:36:33 -07:00
TreeHugger Robot
1026eaee92
Merge "ScanResultTest: Retry scan attempts on failure" into pi-dev
2018-04-12 23:58:51 +00:00
Ray Essick
4fe47e8015
Merge "Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev am: dbfdb95147" into oc-dev am: be259ff997 am: b8f58fb9b6 am: 5a9c21fc33
...
am: 1104b83fea
Change-Id: Idfba1a47dc5e79bdf9a597d71fee13d56325c247
2018-04-09 21:26:49 -07:00
Ray Essick
268ed90a61
Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours am: 72b96b0354 -s ours" into oc-dev am: 68dc050239 am: 6edfe17ca2 am: c8b558b08f -s ours
...
am: b611d433e3
Change-Id: I3d9671e97e2b6a790baf50ff268896e3e44e70a0
2018-04-09 21:22:36 -07:00
Ray Essick
dfecb2a24e
[automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89 am: afef57cad5 am: 1e1b2a7606 am: 9289660d76 am: d89cacb7bf am: 3977adb530
...
am: 50ec655aaa
Change-Id: Iab1af768b369d420a679a16f46b1dfb5258cf388
2018-04-09 21:16:58 -07:00
Ray Essick
f9d2483bf0
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours skipped: d033198a42 skipped: c550755e79 skipped: 27bbc3628e am: ce176b9ffc am: 56927e7cae am: 6e3df95a86 -s ours
...
am: 3e37bc925d
Change-Id: Ifcff53a758ad6a91106efdd09869ba80be858915
2018-04-09 21:13:27 -07:00
Ray Essick
f8b74b0b45
[automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e am: c2f39f64b5 am: 02cf01f51c am: 010e44479d am: 790a6f6d52 am: df21617fed am: 14e18f9179 am: 213fa5b1db
...
am: e18b64e07f
Change-Id: I8d65a3866365f71232e063ea6ad961c61a8df30e
2018-04-09 21:07:59 -07:00
Ray Essick
31a96575fd
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours skipped: 868997117d skipped: a4cf60e6ea skipped: 8b6d971588 skipped: 63eae3a9e1 skipped: 1a158af55d am: 096c85e4cf am: 591f6ccb9c am: bff76d3a93 -s ours
...
am: 33586ec7c3
Change-Id: I9b05a24fbb9f720288c8ada480750ac739564cf9
2018-04-09 21:04:22 -07:00
Ray Essick
dd4a20804a
[automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb am: 70171fe46e am: 6035791a0f am: c0ca2003bc am: c4691f5ad5 am: d27bde6edf am: c5c83b10ac am: 41c0a7b438 am: a11caf34cc am: 10bed1ef52 am: 255cbbc39c
...
am: 6cc16da2a9
Change-Id: I5f03d8e90b65512d0fae094f819a4609d4f3a246
2018-04-09 20:46:02 -07:00
Ray Essick
7d76fb4ff7
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours skipped: 151750d842 skipped: d1811f0384 skipped: bbfa5d23a9 skipped: c407f8968b skipped: 6fc9eb97c5 skipped: 973a5cd865 skipped: cd9a559fd2 skipped: 853c5 skipped: c26ea26d31 am: 4d4f3950b6 am: 06c461a30b am: 205a892ff5 -s ours
...
am: e6af30cb2c
Change-Id: Ia79e0c31285e61be2bf842135d443b0ebadedaf0
2018-04-09 20:42:34 -07:00
Ray Essick
5b7701b09b
[automerger] Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev am: 36b9badd7a am: 27b937e5fc am: 8c0df95444 am: 0c19a15081 am: fbc9d49796 am: 72405a1736 am: 8101a1ba85
...
am: a2c9539bfc
Change-Id: I32bae791f9759b30ba6416e56a8d60694eac6f9b
2018-04-09 20:33:19 -07:00
Ray Essick
5673bfc335
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours skipped: 1cdd92daaa skipped: 7a92b9afdb skipped: 849e67fad2 am: d2e50eb968 am: 66ef84dac4 am: 089012397b -s ours
...
am: 6c3717661f
Change-Id: I07f340879620b0172166a96b4ab9b5d183867b2c
2018-04-09 20:30:23 -07:00
Ray Essick
482dcfe374
Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev am: 1c90ff8dcf am: 5b5f73c2e8 am: 37ca5b50e8 am: 0fae69ebd7
...
am: 2715d84585
Change-Id: I17568e7f1c21952fd6ee2ba2de24f17dba95f9c0
2018-04-09 20:27:00 -07:00
Ray Essick
1dbf965ff8
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours am: 308f60a04c -s ours am: c1a7ce019c am: 7a3920dfa4 am: 6ae132c625 -s ours
...
am: 99a753312a
Change-Id: I987de95482e006fb95e132af8eecb15c2ddfdcf4
2018-04-09 20:23:12 -07:00
Ray Essick
142c62b9e1
Merge "Merge changes from topic "am-1040f2fedf9f49a9a38f5d0878c0a1d0" into oreo-mr1-cts-dev am: 16af42313d" into oc-mr1-dev am: 6e146b4699
...
am: a2c6841c02
Change-Id: I85b6c8a445df3331d571a86db9d54f4c876cc13c
2018-04-09 20:20:07 -07:00
Ray Essick
e680cd3889
Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours am: 72b96b0354 -s ours am: b591008bc2 -s ours" into oc-mr1-dev am: 9d36da58e7 -s ours
...
am: 7f390e3f77
Change-Id: Ia8371c0f97edb3f4389b2fe80910eaa5d9c63969
2018-04-09 20:16:01 -07:00
Ray Essick
d83ab7b222
Merge changes from topic "am-0ac6ccf47239465e9891c4d8b9d8f076" into oc-dev am: 7fc94d02ca am: 52d573a044 am: 91014e8da2
...
am: 9ca1b80cd2
Change-Id: Iad557985f1c7e765bebb418af7bb34ff24453334
2018-04-09 20:12:51 -07:00
Ray Essick
d8dd361f00
Merge changes from topic "asb-2018-04-o" into oreo-cts-dev am: 6977a333a5 am: 51fa4a4cc9 am: ee4732c77c am: 03a6e259da
...
am: 186dbad0df
Change-Id: I473ea09030991a610a4c26f5273b85e200ffdaeb
2018-04-09 20:09:05 -07:00
Ray Essick
26a6930fa3
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f -s ours am: 81c482bdd4 am: a208a33079 am: c8781cfae4 -s ours
...
am: 62874f71ec
Change-Id: I76ef90f114d393dc8fc1d3ad42139551d22592bd
2018-04-09 20:06:05 -07:00
Ray Essick
138e67429a
Merge "Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev am: 0eeb6c53d1" into oc-dev am: f2aeff9120 am: e9a9daa81a am: 0dc9743ac1
...
am: 991bdf22fe
Change-Id: Ib62681d498c607c49bd125af3055d3695fba7894
2018-04-09 20:03:12 -07:00
Ray Essick
572f2bf7ec
Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours am: 8dd2d10a1b -s ours" into oc-dev am: 50988d78ff am: b4dde24b91 am: 9e863b8450 -s ours
...
am: 67798ac557
Change-Id: If2cc83084ab9ceeefa8ad80650c8656bcabff584
2018-04-09 19:59:19 -07:00
Ray Essick
99eb8a471e
Merge "Merge changes from topic "am-96d8ccc4e1e44c30aec62bb030c6529c" into oreo-mr1-cts-dev am: f0c2985ba8" into oc-mr1-dev am: 01a2073429
...
am: 888ba5ef93
Change-Id: Ib3f6d08653c953211cf0afa36e5f4ad3d02a6036
2018-04-09 19:51:18 -07:00
Ray Essick
82f4d79ef5
Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours am: 308f60a04c -s ours am: 3ace7af527 -s ours" into oc-mr1-dev am: f893a5ace2 -s ours
...
am: bff6860b2a
Change-Id: I749496c317a222957dd4c70d304e0f0d6fa249eb
2018-04-09 19:41:43 -07:00
Ray Essick
1104b83fea
Merge "Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev am: dbfdb95147" into oc-dev am: be259ff997 am: b8f58fb9b6
...
am: 5a9c21fc33
Change-Id: I298c568c1a9f438cc75f1854ac311c5b457af9aa
2018-04-09 19:32:17 -07:00
Ray Essick
b611d433e3
Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours am: 72b96b0354 -s ours" into oc-dev am: 68dc050239 am: 6edfe17ca2
...
am: c8b558b08f -s ours
Change-Id: I65ed882d6d08fc63c7679daa0433fc7975d329aa
2018-04-09 19:28:30 -07:00
Ray Essick
50ec655aaa
[automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89 am: afef57cad5 am: 1e1b2a7606 am: 9289660d76 am: d89cacb7bf
...
am: 3977adb530
Change-Id: I85084738c6ac9155425bf5c723dd5956163c619b
2018-04-09 19:25:19 -07:00
Ray Essick
3e37bc925d
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours skipped: d033198a42 skipped: c550755e79 skipped: 27bbc3628e am: ce176b9ffc am: 56927e7cae
...
am: 6e3df95a86 -s ours
Change-Id: I8de961181b0fcc9ac2038a833a6f3b7ad39f23a8
2018-04-09 19:21:56 -07:00
Ray Essick
135f60ffa5
Merge changes from topic "am-ef41260469b74ed484092f80fc943840" into oc-mr1-dev am: 73a2c644b7
...
am: 9c147bd5d7
Change-Id: Ieb6f2c8780c37fb8060afb22adc0bb9493f2ba01
2018-04-09 19:18:11 -07:00
Ray Essick
e18b64e07f
[automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e am: c2f39f64b5 am: 02cf01f51c am: 010e44479d am: 790a6f6d52 am: df21617fed am: 14e18f9179
...
am: 213fa5b1db
Change-Id: Ica7fb8d109c22c4f5ff9be80d0bea41e6d8b552e
2018-04-09 19:17:52 -07:00
Ray Essick
7f8a0e9860
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours skipped: d4d28bcb12 skipped: 948813147b skipped: 1cd8984784 am: 0c883452f2 am: aa7ce42421 am: 749e2c39a0 -s ours
...
am: 2001900f59
Change-Id: Iaa5877ba2f8968807f8b9583fda7ef93d2dcc579
2018-04-09 19:14:40 -07:00
Ray Essick
33586ec7c3
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours skipped: 868997117d skipped: a4cf60e6ea skipped: 8b6d971588 skipped: 63eae3a9e1 skipped: 1a158af55d am: 096c85e4cf am: 591f6ccb9c
...
am: bff76d3a93 -s ours
Change-Id: Ie689f7ee5fe7459eb21d742617a219391060fad5
2018-04-09 19:14:36 -07:00
Ray Essick
6cc16da2a9
[automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb am: 70171fe46e am: 6035791a0f am: c0ca2003bc am: c4691f5ad5 am: d27bde6edf am: c5c83b10ac am: 41c0a7b438 am: a11caf34cc am: 10bed1ef52
...
am: 255cbbc39c
Change-Id: I44d015880ab51ca2f3a8d56ab9fcfffa752583e4
2018-04-09 19:11:42 -07:00
Ray Essick
e6af30cb2c
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours skipped: 151750d842 skipped: d1811f0384 skipped: bbfa5d23a9 skipped: c407f8968b skipped: 6fc9eb97c5 skipped: 973a5cd865 skipped: cd9a559fd2 skipped: 853c5 skipped: c26ea26d31 am: 4d4f3950b6 am: 06c461a30b
...
am: 205a892ff5 -s ours
Change-Id: I26b527b1e40d2a29917421c4544908a5ef60f19d
2018-04-09 19:08:45 -07:00
Ray Essick
a2c9539bfc
[automerger] Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev am: 36b9badd7a am: 27b937e5fc am: 8c0df95444 am: 0c19a15081 am: fbc9d49796 am: 72405a1736
...
am: 8101a1ba85
Change-Id: Idc7e17f08c59629680f30be28c056b14fa00228f
2018-04-09 19:06:17 -07:00
Ray Essick
6c3717661f
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours skipped: 1cdd92daaa skipped: 7a92b9afdb skipped: 849e67fad2 am: d2e50eb968 am: 66ef84dac4
...
am: 089012397b -s ours
Change-Id: I8115640bfa76cd2f245880afb901f354f98569fb
2018-04-09 19:03:03 -07:00
Ray Essick
2715d84585
Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev am: 1c90ff8dcf am: 5b5f73c2e8 am: 37ca5b50e8
...
am: 0fae69ebd7
Change-Id: Iae8c06a591d43e850ee5deacf9efaffc4bd2048e
2018-04-09 19:02:07 -07:00
Ray Essick
99a753312a
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours am: 308f60a04c -s ours am: c1a7ce019c am: 7a3920dfa4
...
am: 6ae132c625 -s ours
Change-Id: Ic3853238342398a8ddc409c7a45c866eb1e58714
2018-04-09 18:58:24 -07:00
Ray Essick
a2c6841c02
Merge "Merge changes from topic "am-1040f2fedf9f49a9a38f5d0878c0a1d0" into oreo-mr1-cts-dev am: 16af42313d" into oc-mr1-dev
...
am: 6e146b4699
Change-Id: Ief4132902a45fe9d344105233e8119163afa4160
2018-04-09 18:57:24 -07:00
Ray Essick
3169e37e6c
Merge "Merge changes from topic "am-255f7edfcc6f4ec1a5498250fdcf0dc9" into oreo-mr1-cts-dev am: f095afee74" into oc-mr1-dev am: ff27094d88
...
am: 076db23a54
Change-Id: I4f1f060af864dc8e381aa2a78873fcc75552f10d
2018-04-09 18:56:36 -07:00
Ray Essick
fe51f482f1
Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f -s ours am: 26d4c1f151 -s ours" into oc-mr1-dev am: 61b59aed96 -s ours
...
am: 1de9011e66
Change-Id: Icc9230e185b8286d3975b0129d11ee29410c0361
2018-04-09 18:52:47 -07:00
Ray Essick
5a9c21fc33
Merge "Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev am: dbfdb95147" into oc-dev am: be259ff997
...
am: b8f58fb9b6
Change-Id: Id856b845af55179f7d96ed55f0c5b7118c797a56
2018-04-09 18:51:42 -07:00
Ray Essick
7f390e3f77
Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours am: 72b96b0354 -s ours am: b591008bc2 -s ours" into oc-mr1-dev
...
am: 9d36da58e7 -s ours
Change-Id: I15ddd6c39cfe9b95c1a677685a0aa93c01856d16
2018-04-09 18:50:47 -07:00
Ray Essick
9ca1b80cd2
Merge changes from topic "am-0ac6ccf47239465e9891c4d8b9d8f076" into oc-dev am: 7fc94d02ca am: 52d573a044
...
am: 91014e8da2
Change-Id: Ib327df02fff8bf808663e0b960efa0ebf9445d51
2018-04-09 18:49:49 -07:00
Ray Essick
186dbad0df
Merge changes from topic "asb-2018-04-o" into oreo-cts-dev am: 6977a333a5 am: 51fa4a4cc9 am: ee4732c77c
...
am: 03a6e259da
Change-Id: I0abec8285d7b28a3bd9190015cd42416a571f4ce
2018-04-09 18:46:06 -07:00
Ray Essick
c8b558b08f
Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours am: 72b96b0354 -s ours" into oc-dev am: 68dc050239
...
am: 6edfe17ca2
Change-Id: I19b5b17dbd213dd08432c20c1a54b2c1c70a7eb1
2018-04-09 18:46:00 -07:00
Ray Essick
62874f71ec
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f -s ours am: 81c482bdd4 am: a208a33079
...
am: c8781cfae4 -s ours
Change-Id: I33e6cd995c4dd44e5f2a2da606301b6a094c2c54
2018-04-09 18:43:17 -07:00