diff options
| -rwxr-xr-x | core/res/res/values/config.xml | 4 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 4cf4774..4f7432f 100755 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -266,6 +266,10 @@ point on the move. A value of 0 means no periodic scans will be used in the framework. --> <integer translatable="false" name="config_wifi_framework_scan_interval">300000</integer> + <!-- Wifi driver stop delay, in milliseconds. + Default value is 2 minutes. --> + <integer translatable="false" name="config_wifi_driver_stop_delay">120000</integer> + <!-- Flag indicating whether the keyguard should be bypassed when the slider is open. This can be set or unset depending how easily the slider can be opened (for example, in a pocket or purse). --> diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index 82abe3a..71a76dc 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -415,7 +415,7 @@ public class WifiStateMachine extends StateMachine { * Starting and shutting down driver too quick causes problems leading to driver * being in a bad state. Delay driver stop. */ - private static final int DELAYED_DRIVER_STOP_MS = 2 * 60 * 1000; /* 2 minutes */ + private final int mDriverStopDelayMs; private int mDelayedStopCounter; private boolean mInDelayedStop = false; @@ -583,6 +583,9 @@ public class WifiStateMachine extends StateMachine { mDefaultSupplicantScanIntervalMs = mContext.getResources().getInteger( com.android.internal.R.integer.config_wifi_supplicant_scan_interval); + mDriverStopDelayMs = mContext.getResources().getInteger( + com.android.internal.R.integer.config_wifi_driver_stop_delay); + mContext.registerReceiver( new BroadcastReceiver() { @Override @@ -2597,7 +2600,7 @@ public class WifiStateMachine extends StateMachine { } else { /* send regular delayed shut down */ sendMessageDelayed(obtainMessage(CMD_DELAYED_STOP_DRIVER, - mDelayedStopCounter, 0), DELAYED_DRIVER_STOP_MS); + mDelayedStopCounter, 0), mDriverStopDelayMs); } break; case CMD_START_DRIVER: |