diff options
| author | Paul Stewart <pstew@google.com> | 2016-03-11 20:31:43 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2016-03-11 20:31:43 +0000 |
| commit | 03e6c26c18a2bc89471569a899bef913c2770b36 (patch) | |
| tree | f62cbc324dfbb739bd3dc75f22e84e09b027e0b1 /service | |
| parent | 017307e0d7133f3b2523090136b919c6f494098e (diff) | |
| parent | fc0f43edd0def7d760e42d6e800d862007cf9fd5 (diff) | |
Merge "WifiStateMachine: Return to InitialState if driver start fails" into mm-wireless-dev
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index bbca61123..ef5d6e966 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -5546,7 +5546,8 @@ public class WifiStateMachine extends StateMachine implements WifiNative.PnoEven if (message.arg1 == mDriverStartToken) { if (mTries >= 2) { loge("Failed to start driver after " + mTries); - transitionTo(mDriverStoppedState); + setSupplicantRunning(false); + setSupplicantRunning(true); } else { loge("Driver start failed, retrying"); mWakeLock.acquire(); |