am 9f250e28: am 93647e2f: Merge "Temporarily disable \'Scan Always\' mode" into jb-mr2-dev

* commit '9f250e28c39abfb14a80c1997a1915b97940e070':
  Temporarily disable 'Scan Always' mode

2 files changed, 9 insertions, 2 deletions

diff --git a/services/java/com/android/server/wifi/WifiController.java b/services/java/com/android/server/wifi/WifiController.java
index 87b4394..4594fa6 100644
--- a/services/java/com/android/server/wifi/WifiController.java
+++ b/services/java/com/android/server/wifi/WifiController.java
@@ -379,6 +379,9 @@ 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();
@@ -496,6 +499,9 @@ 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 3ff8061..f5c6ec3 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 = getPersistedScanAlwaysAvailable();
+        mScanAlwaysAvailable = false; // getPersistedScanAlwaysAvailable();
     }
 
     synchronized boolean isWifiToggleEnabled() {
@@ -124,7 +124,8 @@ final class WifiSettingsStore {
     }
 
     synchronized void handleWifiScanAlwaysAvailableToggled() {
-        mScanAlwaysAvailable = getPersistedScanAlwaysAvailable();
+        // mScanAlwaysAvailable = getPersistedScanAlwaysAvailable();
+        mScanAlwaysAvailable = false;
     }
 
     void dump(FileDescriptor fd, PrintWriter pw, String[] args) {