From 8d9167ded3a27607b3f231363a7b224e37d570ad Mon Sep 17 00:00:00 2001
From: Robert Greenwalt <rgreenwalt@google.com>
Date: Wed, 9 Oct 2013 16:31:35 -0700
Subject: [PATCH] Narrow previous fix for this issue.

Networks should be unconditionally disabled when going to
scan only state or we risk connecting when we don't want to.

bug:11062188
Change-Id: If89621ca07d86673a661d2e5fe4ce89286f8835e
---
 wifi/java/android/net/wifi/WifiStateMachine.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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