Commit Graph

2477 Commits

Author SHA1 Message Date
Roshan Pius
7457ee7eb8 WifiManagerTest: Fetch scan results only on scan success
When wifi location scans are off, the scan is expected to fail. But,
WifiManager.getScanResults() could still return results from the last
scan. This was causing the test to fail because it was relying on
|mScanResults| being null to detect scan failure.

Also, changed the scan done internal state name in the test to more accurately
reflect that scan has been completed (could be success or failure).

Bug: 77601152
Test: Ran `atest android.net.wifi.cts.WifiManagerTest#
testWifiManagerScanWhenWifiOffLocationTurnedOn` with location turned on,
but wifi scans turned off.

Change-Id: I6d5203a836d86d03fbb8e9af0035fe951a6b9db8
2018-04-24 13:56:43 -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
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
TreeHugger Robot
1026eaee92 Merge "ScanResultTest: Retry scan attempts on failure" into pi-dev 2018-04-12 23:58:51 +00: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
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
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
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
Ray Essick
991bdf22fe Merge "Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev am: 0eeb6c53d1" into oc-dev am: f2aeff9120 am: e9a9daa81a
am: 0dc9743ac1

Change-Id: I918d6def4a54a838c8358881cf06f941ee6d00bf
2018-04-09 18:42:12 -07:00
Ray Essick
3977adb530 [automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89 am: afef57cad5 am: 1e1b2a7606 am: 9289660d76
am: d89cacb7bf

Change-Id: Iafd862995f1944bb56c5829a10dc8b997f941d2c
2018-04-09 18:41:41 -07:00
Ray Essick
b8f58fb9b6 Merge "Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev am: dbfdb95147" into oc-dev
am: be259ff997

Change-Id: I4fab6e7b601a853787226c12a8573e1f57306306
2018-04-09 18:41:09 -07:00
Ray Essick
6e3df95a86 [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

Change-Id: I183ec019764bc32754825b33b9ed29edd16e23ad
2018-04-09 18:38:48 -07:00
Ray Essick
67798ac557 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

Change-Id: I396fa8b81fc094b9b87d37835742bc9119e7a465
2018-04-09 18:37:42 -07:00
Ray Essick
888ba5ef93 Merge "Merge changes from topic "am-96d8ccc4e1e44c30aec62bb030c6529c" into oreo-mr1-cts-dev am: f0c2985ba8" into oc-mr1-dev
am: 01a2073429

Change-Id: I658bb749415a0d9fdf710d51c83d742abde2866d
2018-04-09 18:36:10 -07:00
Ray Essick
bff6860b2a 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

Change-Id: Ic93c17bfb0ecfa4475c884fe951acf5750188952
2018-04-09 18:30:40 -07:00
Ray Essick
9c147bd5d7 Merge changes from topic "am-ef41260469b74ed484092f80fc943840" into oc-mr1-dev
am: 73a2c644b7

Change-Id: I2566fc1242d2b3c73e951e4fd30264a7439a8411
2018-04-09 18:29:13 -07:00
Ray Essick
2001900f59 [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

Change-Id: I647ba112083610f0c586473c6230f674fe1887e5
2018-04-09 18:22:54 -07:00
Ray Essick
213fa5b1db [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

Change-Id: I7df6f22f99aba634b635c73d7221d242d46cf4a3
2018-04-09 18:15:47 -07:00
Ray Essick
bff76d3a93 [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

Change-Id: I352ea2e10daeaece58dd03f8e129d1d838f49366
2018-04-09 18:13:15 -07:00
Ray Essick
255cbbc39c [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

Change-Id: Iba19c21dfb4bdeff88c166eb7c34bcdb0fdcc8aa
2018-04-09 18:08:15 -07:00
Ray Essick
205a892ff5 [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

Change-Id: Ib2de287366bc0e717623270d646e3d03949e2afd
2018-04-09 18:05:18 -07:00
Ray Essick
6edfe17ca2 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

Change-Id: If6bacdfd0aa41e6fa22dfc86c90607f5f4560230
2018-04-09 18:01:25 -07:00
Ray Essick
8101a1ba85 [automerger] Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev am: 36b9badd7a am: 27b937e5fc am: 8c0df95444 am: 0c19a15081 am: fbc9d49796
am: 72405a1736

Change-Id: Ib79f8a690859b8fa6cc3d3a06cccf3d2d33e9ee4
2018-04-09 18:00:29 -07:00
Ray Essick
089012397b [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

Change-Id: Ia816131e3315500353a1f930b20881041e7e3f84
2018-04-09 17:57:49 -07:00
Ray Essick
d89cacb7bf [automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89 am: afef57cad5 am: 1e1b2a7606
am: 9289660d76

Change-Id: I928824447efd55a1426992b7c2443d5ac932f402
2018-04-09 17:56:53 -07:00
Ray Essick
0fae69ebd7 Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev am: 1c90ff8dcf am: 5b5f73c2e8
am: 37ca5b50e8

Change-Id: Iae252f3f444f11641ef92a39494c85f57566de2c
2018-04-09 17:55:16 -07:00
Ray Essick
56927e7cae [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

Change-Id: I9bae103b065f64519e4cc9a844b47af36e49c0a6
2018-04-09 17:54:49 -07:00
Ray Essick
14e18f9179 [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

Change-Id: Ic47dd0a300198bb02d4fbdf7f8d77a4b0eb2ab5b
2018-04-09 17:50:54 -07:00
Ray Essick
591f6ccb9c [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

Change-Id: Ib2f1f30d361a9854505178b1504ca63a648a1e0a
2018-04-09 17:48:42 -07:00
Ray Essick
10bed1ef52 [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

Change-Id: Ie003213690a2ac4baf087857a8406abde342b90c
2018-04-09 17:45:03 -07:00
Ray Essick
06c461a30b [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

Change-Id: I04cf9cf4b0bb75e97c45ad4f2c3fe34b03281d75
2018-04-09 17:42:39 -07:00
Ray Essick
72405a1736 [automerger] Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev am: 36b9badd7a am: 27b937e5fc am: 8c0df95444 am: 0c19a15081
am: fbc9d49796

Change-Id: Ia31c9e335262a173961abbeb1f573d342185e5d4
2018-04-09 17:38:19 -07:00
Ray Essick
6ae132c625 [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

Change-Id: I284890418cc5fe265d261b4c2852ebb083a7d34c
2018-04-09 17:36:36 -07:00
Ray Essick
66ef84dac4 [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

Change-Id: Ic6167b5ab7a083acc7f76defd0e197e9fd159330
2018-04-09 17:36:24 -07:00
Android Build Merger (Role)
6e146b4699 Merge "Merge changes from topic "am-1040f2fedf9f49a9a38f5d0878c0a1d0" into oreo-mr1-cts-dev am: 16af42313d" into oc-mr1-dev 2018-04-10 00:34:26 +00:00