summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/wifi/WifiController.java
diff options
context:
space:
mode:
authorVinit Deshapnde <vinitd@google.com>2013-07-01 17:10:28 -0700
committerVinit Deshapnde <vinitd@google.com>2013-07-01 17:10:28 -0700
commitc16b0d0061108685e74b40d77ad801fe0304bc42 (patch)
tree62c3a6df59e1f7b9e6f0c7d9f8d3fbac38685a46 /services/java/com/android/server/wifi/WifiController.java
parente9df511e2018eb6a296408d09e355c6f2c77ae59 (diff)
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/java/com/android/server/wifi/WifiController.java')
-rw-r--r--services/java/com/android/server/wifi/WifiController.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/services/java/com/android/server/wifi/WifiController.java b/services/java/com/android/server/wifi/WifiController.java
index 87b43946a73a..4594fa6789a8 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);