commit 1188119630cde7bdb20a5d49c0ce9f15f751bce0
author The Android Automerger <android-build@google.com> Sun Jun 30 05:55:16 2013 -0700
committer The Android Automerger <android-build@google.com> Sun Jun 30 05:55:16 2013 -0700
tree 860be35afe08a3a6e43013fa0b803c7e5aca2028
parent d0166b0ad495b5d47d792ac0b8c65f9bcc24a151
parent d274c05ff319a02958455145ce42a86cde62c79a

merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev

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

diff --git a/tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java b/tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java
index 283f63b..2580dbe 100644
--- a/tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java
+++ b/tests/tests/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));