commit 1f902a55f87990b0295459f665227fda1b04178f
author Vinit Deshpande <vinitd@google.com> Wed Jul 03 00:10:53 2013 +0000
committer The Android Automerger <android-build@android.com> Tue Jul 09 16:32:07 2013 -0700
tree 5c954d6c6d2b2ba7010f8ac135acbd3548d4400f
parent 58101e218cb014322798fe18e4ef5f08395f9a30

Revert "Temporarily disable 'Scan Always' mode"

This reverts commit c16b0d0061108685e74b40d77ad801fe0304bc42.

Change-Id: I89a23f5d786a53eea97fef3f19bd15f97fc26157

services/java/com/android/server/wifi/WifiController.java

diff --git a/services/java/com/android/server/wifi/WifiController.java b/services/java/com/android/server/wifi/WifiController.java
index 4594fa67..87b4394 100644
--- a/services/java/com/android/server/wifi/WifiController.java
+++ b/services/java/com/android/server/wifi/WifiController.java
@@ -379,9 +379,6 @@
 
         @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 @@
 
         @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);

services/java/com/android/server/wifi/WifiSettingsStore.java

diff --git a/services/java/com/android/server/wifi/WifiSettingsStore.java b/services/java/com/android/server/wifi/WifiSettingsStore.java
index f5c6ec3..3ff8061 100644
--- a/services/java/com/android/server/wifi/WifiSettingsStore.java
+++ b/services/java/com/android/server/wifi/WifiSettingsStore.java
@@ -51,7 +51,7 @@
         mContext = context;
         mAirplaneModeOn = getPersistedAirplaneModeOn();
         mPersistWifiState = getPersistedWifiState();
-        mScanAlwaysAvailable = false; // getPersistedScanAlwaysAvailable();
+        mScanAlwaysAvailable = getPersistedScanAlwaysAvailable();
     }
 
     synchronized boolean isWifiToggleEnabled() {
@@ -124,8 +124,7 @@
     }
 
     synchronized void handleWifiScanAlwaysAvailableToggled() {
-        // mScanAlwaysAvailable = getPersistedScanAlwaysAvailable();
-        mScanAlwaysAvailable = false;
+        mScanAlwaysAvailable = getPersistedScanAlwaysAvailable();
     }
 
     void dump(FileDescriptor fd, PrintWriter pw, String[] args) {