commit 822136e2c00af935d0f3da4a509717252cb9c1da
author Robert Greenwalt <rgreenwalt@google.com> Thu Jun 27 14:50:49 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 27 14:50:49 2013 -0700
tree 20b98d912e2284d820941f623c8e6b7b2357932c
parent 397ae6e5d018bff472cac12eb184c6cf700e7e63
parent 5faebf8a570ad1ced971aa1c3b7d53eff82b6ff3

am 5faebf8a: am c8ddd2d7: Fix CTS test for scan-always-available env

* commit '5faebf8a570ad1ced971aa1c3b7d53eff82b6ff3':
  Fix CTS test for scan-always-available env

tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java

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 283f63b..2580dbe 100644
--- a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
+++ b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
@@ -233,7 +233,7 @@
         startScan();
         setWifiEnabled(false);
         Thread.sleep(DURATION);
-        assertFalse(mWifiManager.pingSupplicant());
+        assertTrue(mWifiManager.pingSupplicant() == mWifiManager.isScanAlwaysAvailable());
         final String TAG = "Test";
         assertNotNull(mWifiManager.createWifiLock(TAG));
         assertNotNull(mWifiManager.createWifiLock(WifiManager.WIFI_MODE_FULL, TAG));