Merge "Don't mark wifi disabled unless it's off." into klp-dev

2013-10-09 23:26:50 +00:00
parent b1b2789d1c 15af21252d
commit 709a42783b
1 changed files with 4 additions and 2 deletions
--- a/wifi/java/android/net/wifi/WifiStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiStateMachine.java
@@ -2957,8 +2957,10 @@ public class WifiStateMachine extends StateMachine {

            if (mOperationalMode != CONNECT_MODE) {
                mWifiNative.disconnect();
-                mWifiConfigStore.disableAllNetworks();
-                setWifiState(WIFI_STATE_DISABLED);
+                if (mOperationalMode == SCAN_ONLY_WITH_WIFI_OFF_MODE) {
+                    mWifiConfigStore.disableAllNetworks();
+                    setWifiState(WIFI_STATE_DISABLED);
+                }
                transitionTo(mScanModeState);
            } else {
                /* Driver stop may have disabled networks, enable right after start */