diff options
| author | Paul Stewart <pstew@google.com> | 2016-03-11 20:38:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-11 20:38:41 +0000 |
| commit | 963a22849edcbebdfe3bf2ecf2329a20789dbd7a (patch) | |
| tree | 0de65892e21d8ac511494db9d25ff7a235bc7e78 /service | |
| parent | bb1378fdf0fba19ad35de8803f33cdc663cfbea7 (diff) | |
| parent | 03e6c26c18a2bc89471569a899bef913c2770b36 (diff) | |
Merge "WifiStateMachine: Return to InitialState if driver start fails" into mm-wireless-dev
am: 03e6c26c18
* commit '03e6c26c18a2bc89471569a899bef913c2770b36':
WifiStateMachine: Return to InitialState if driver start fails
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(); |