diff options
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateTracker.java | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java index 38464be..73b6ec1 100644 --- a/wifi/java/android/net/wifi/WifiStateTracker.java +++ b/wifi/java/android/net/wifi/WifiStateTracker.java @@ -1286,15 +1286,13 @@ public class WifiStateTracker extends NetworkStateTracker { if (macaddr != null) { mWifiInfo.setMacAddress(macaddr); } - if (mRunState == RUN_STATE_STARTING) { - mRunState = RUN_STATE_RUNNING; - if (!mIsScanOnly) { - reconnectCommand(); - } else { - // In some situations, supplicant needs to be kickstarted to - // start the background scanning - scan(true); - } + mRunState = RUN_STATE_RUNNING; + if (!mIsScanOnly) { + reconnectCommand(); + } else { + // In some situations, supplicant needs to be kickstarted to + // start the background scanning + scan(true); } } break; @@ -1614,12 +1612,10 @@ public class WifiStateTracker extends NetworkStateTracker { } public synchronized boolean restart() { - if (mRunState == RUN_STATE_STOPPED) { + if (isDriverStopped()) { mRunState = RUN_STATE_STARTING; resetConnections(true); return startDriver(); - } else if (mRunState == RUN_STATE_STOPPING) { - mRunState = RUN_STATE_STARTING; } return true; } |