From e549804b9d0e4ae2cca84a13c19838c5c8398df1 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Wed, 18 Apr 2018 15:48:33 -0700 Subject: [PATCH] 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 --- tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 292ff0fd75..c435a8ae4c 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 @@ public class WifiManagerTest extends AndroidTestCase { 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());