diff options
author | Vinit Deshapnde <vinitd@google.com> | 2013-07-01 17:10:28 -0700 |
---|---|---|
committer | Vinit Deshapnde <vinitd@google.com> | 2013-07-01 17:10:28 -0700 |
commit | c16b0d0061108685e74b40d77ad801fe0304bc42 (patch) | |
tree | 62c3a6df59e1f7b9e6f0c7d9f8d3fbac38685a46 /services | |
parent | e9df511e2018eb6a296408d09e355c6f2c77ae59 (diff) | |
download | frameworks_base-c16b0d0061108685e74b40d77ad801fe0304bc42.zip frameworks_base-c16b0d0061108685e74b40d77ad801fe0304bc42.tar.gz frameworks_base-c16b0d0061108685e74b40d77ad801fe0304bc42.tar.bz2 |
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
Diffstat (limited to 'services')
-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, 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) { |