diff options
| -rw-r--r-- | services/java/com/android/server/wifi/WifiController.java | 6 | ||||
| -rw-r--r-- | services/java/com/android/server/wifi/WifiSettingsStore.java | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/services/java/com/android/server/wifi/WifiController.java b/services/java/com/android/server/wifi/WifiController.java index 4594fa6789a8..87b43946a73a 100644 --- a/services/java/com/android/server/wifi/WifiController.java +++ b/services/java/com/android/server/wifi/WifiController.java @@ -379,9 +379,6 @@ class WifiController extends StateMachine { @Override public void enter() { - - if (DBG) logd("Going to disabled without scan state"); - mWifiStateMachine.setSupplicantRunning(false); // Supplicant can't restart right away, so not the time we switched off mDisabledTimestamp = SystemClock.elapsedRealtime(); @@ -499,9 +496,6 @@ class WifiController extends StateMachine { @Override public void enter() { - - if (DBG) logd("Enabling disabled with scan state"); - mWifiStateMachine.setSupplicantRunning(true); mWifiStateMachine.setOperationalMode(WifiStateMachine.SCAN_ONLY_WITH_WIFI_OFF_MODE); mWifiStateMachine.setDriverStart(true); diff --git a/services/java/com/android/server/wifi/WifiSettingsStore.java b/services/java/com/android/server/wifi/WifiSettingsStore.java index f5c6ec30700d..3ff80616142c 100644 --- a/services/java/com/android/server/wifi/WifiSettingsStore.java +++ b/services/java/com/android/server/wifi/WifiSettingsStore.java @@ -51,7 +51,7 @@ final class WifiSettingsStore { mContext = context; mAirplaneModeOn = getPersistedAirplaneModeOn(); mPersistWifiState = getPersistedWifiState(); - mScanAlwaysAvailable = false; // getPersistedScanAlwaysAvailable(); + mScanAlwaysAvailable = getPersistedScanAlwaysAvailable(); } synchronized boolean isWifiToggleEnabled() { @@ -124,8 +124,7 @@ final class WifiSettingsStore { } synchronized void handleWifiScanAlwaysAvailableToggled() { - // mScanAlwaysAvailable = getPersistedScanAlwaysAvailable(); - mScanAlwaysAvailable = false; + mScanAlwaysAvailable = getPersistedScanAlwaysAvailable(); } void dump(FileDescriptor fd, PrintWriter pw, String[] args) { |