commit 6717e1d86fc008adc95eb80bc3fe2a4cc0b29fe9
author Robert Greenwalt <rgreenwalt@google.com> Wed Oct 09 17:14:37 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 09 17:14:37 2013 -0700
tree 848d5574ac179c1e6ca39d649ceb5a870ef37871
parent af0a388b7daa270390065c7f658367de5b0abbdb
parent 7ecedb75c833a746c561dd0029b0accf175033be

am 7ecedb75: am f008ca33: am f681058f: Merge "Narrow previous fix for this issue." into klp-dev

* commit '7ecedb75c833a746c561dd0029b0accf175033be':
  Narrow previous fix for this issue.

wifi/java/android/net/wifi/WifiStateMachine.java

diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java
index cdafd9e..6b4c580 100644
--- a/wifi/java/android/net/wifi/WifiStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiStateMachine.java
@@ -2957,8 +2957,8 @@
 
             if (mOperationalMode != CONNECT_MODE) {
                 mWifiNative.disconnect();
+                mWifiConfigStore.disableAllNetworks();
                 if (mOperationalMode == SCAN_ONLY_WITH_WIFI_OFF_MODE) {
-                    mWifiConfigStore.disableAllNetworks();
                     setWifiState(WIFI_STATE_DISABLED);
                 }
                 transitionTo(mScanModeState);