Snap for 4736748 from 28576857594c5eb575fe019bae74fedc85292894 to pi-release
Change-Id: If7ae01222eb7c1896382a677ab9ce5ff9c974986
diff --git a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
index 292ff0f..c435a8a 100644
--- a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
+++ b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
@@ -295,11 +295,10 @@
fail("Please enable location for this test - since Marshmallow WiFi scan results are"
+ " empty when location is disabled!");
}
- assertTrue(mWifiManager.isScanAlwaysAvailable());
setWifiEnabled(false);
Thread.sleep(DURATION);
startScan();
- if (isScanCurrentlyAvailable()) {
+ if (mWifiManager.isScanAlwaysAvailable() && isScanCurrentlyAvailable()) {
// Make sure at least one AP is found.
assertNotNull("mScanResult should not be null!", mScanResults);
assertFalse("empty scan results!", mScanResults.isEmpty());