Merge "Fix handling in DisconnectingState" into ics-mr0

2011-10-20 15:05:07 -07:00
parent 957ad44e9c 2d57d860c2
commit 2159927f36
1 changed files with 6 additions and 1 deletions
--- a/wifi/java/android/net/wifi/WifiStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiStateMachine.java
@@ -3043,9 +3043,14 @@ public class WifiStateMachine extends StateMachine {
                        deferMessage(message);
                    }
                    break;
-                    /* Handle in  DisconnectedState */
                case WifiMonitor.SUPPLICANT_STATE_CHANGE_EVENT:
+                    /* If we get a SUPPLICANT_STATE_CHANGE_EVENT before NETWORK_DISCONNECTION_EVENT
+                     * we have missed the network disconnection, transition to mDisconnectedState
+                     * and handle the rest of the events there
+                     */
                    deferMessage(message);
+                    handleNetworkDisconnect();
+                    transitionTo(mDisconnectedState);
                    break;
                default:
                    return NOT_HANDLED;