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

* commit 'f681058f2dc08ebfbde93f30b160d5d53f104c99':
  Narrow previous fix for this issue.
This commit is contained in:
Robert Greenwalt
2013-10-09 17:10:14 -07:00
committed by Android Git Automerger

View File

@@ -2957,8 +2957,8 @@ public class WifiStateMachine extends StateMachine {
if (mOperationalMode != CONNECT_MODE) { if (mOperationalMode != CONNECT_MODE) {
mWifiNative.disconnect(); mWifiNative.disconnect();
mWifiConfigStore.disableAllNetworks();
if (mOperationalMode == SCAN_ONLY_WITH_WIFI_OFF_MODE) { if (mOperationalMode == SCAN_ONLY_WITH_WIFI_OFF_MODE) {
mWifiConfigStore.disableAllNetworks();
setWifiState(WIFI_STATE_DISABLED); setWifiState(WIFI_STATE_DISABLED);
} }
transitionTo(mScanModeState); transitionTo(mScanModeState);