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

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

View File

@@ -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);