Merge "Fix handling in DisconnectingState" into ics-mr0
This commit is contained in:
committed by
Android (Google) Code Review
commit
2159927f36
@@ -3043,9 +3043,14 @@ public class WifiStateMachine extends StateMachine {
|
|||||||
deferMessage(message);
|
deferMessage(message);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
/* Handle in DisconnectedState */
|
|
||||||
case WifiMonitor.SUPPLICANT_STATE_CHANGE_EVENT:
|
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);
|
deferMessage(message);
|
||||||
|
handleNetworkDisconnect();
|
||||||
|
transitionTo(mDisconnectedState);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return NOT_HANDLED;
|
return NOT_HANDLED;
|
||||||
|
|||||||
Reference in New Issue
Block a user