diff options
| author | Mike Lockwood <lockwood@google.com> | 2012-02-04 12:05:31 -0500 |
|---|---|---|
| committer | Mike Lockwood <lockwood@google.com> | 2012-03-22 15:09:05 -0700 |
| commit | 09a12bcfab6600a8cc017f0a5f92259dfc8fc471 (patch) | |
| tree | 1c822b36cdbafa838e5dfe9921ff40ff324bc6d0 /wifi/java/android | |
| parent | 86548c472afc3700969fafb42b7ce6aa6dae0005 (diff) | |
| download | frameworks_base-09a12bcfab6600a8cc017f0a5f92259dfc8fc471.zip frameworks_base-09a12bcfab6600a8cc017f0a5f92259dfc8fc471.tar.gz frameworks_base-09a12bcfab6600a8cc017f0a5f92259dfc8fc471.tar.bz2 | |
WifiStateMachine: Move wifi teardown delay to a framework resource
Bug: 5931171
Change-Id: I96a4e3bf1d044ea4a4d2955775703b6f0ce862ed
Signed-off-by: Mike Lockwood <lockwood@google.com>
Diffstat (limited to 'wifi/java/android')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index 05a8ca7..cbf7bf8 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -394,7 +394,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; @@ -563,6 +563,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 @@ -2589,7 +2592,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: |