Temporarily disable 'Scan Always' mode
This change disables 'Scan Always' by ignoring the setting; and
hard coding value to 'false'. The UI will change based on whatever
is in settings; but underneath we won't enable scans when WiFi is
off.
Change-Id: Ibb1401207b6675e609e979ea23b63177814f762c
diff --git a/services/java/com/android/server/wifi/WifiController.java b/services/java/com/android/server/wifi/WifiController.java
index 87b4394..4594fa67 100644
--- a/services/java/com/android/server/wifi/WifiController.java
+++ b/services/java/com/android/server/wifi/WifiController.java
@@ -379,6 +379,9 @@
@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 @@
@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 @@
mContext = context;
mAirplaneModeOn = getPersistedAirplaneModeOn();
mPersistWifiState = getPersistedWifiState();
- mScanAlwaysAvailable = getPersistedScanAlwaysAvailable();
+ mScanAlwaysAvailable = false; // getPersistedScanAlwaysAvailable();
}
synchronized boolean isWifiToggleEnabled() {
@@ -124,7 +124,8 @@
}
synchronized void handleWifiScanAlwaysAvailableToggled() {
- mScanAlwaysAvailable = getPersistedScanAlwaysAvailable();
+ // mScanAlwaysAvailable = getPersistedScanAlwaysAvailable();
+ mScanAlwaysAvailable = false;
}
void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
