diff options
| author | Yuhao Zheng <yuhaozheng@google.com> | 2013-10-08 17:44:05 -0700 |
|---|---|---|
| committer | Yuhao Zheng <yuhaozheng@google.com> | 2013-10-08 18:16:03 -0700 |
| commit | a9e6be83aeafd6e97e5eb52e12766b476ab94da0 (patch) | |
| tree | 2d682a05aa2b6077ecddb0b9f366af78e9494149 /wifi/java/android/net | |
| parent | e60b7bf7f570a93cbab48e3763cb50d51ee4aa03 (diff) | |
| download | frameworks_base-a9e6be83aeafd6e97e5eb52e12766b476ab94da0.zip frameworks_base-a9e6be83aeafd6e97e5eb52e12766b476ab94da0.tar.gz frameworks_base-a9e6be83aeafd6e97e5eb52e12766b476ab94da0.tar.bz2 | |
WifiStateMachine: fix for exiting L2ConnectedState
After a L2ConnectedState to WpsRunningState transition, network is disconnected.
However, the disconnected message is ignored by WpsRunningState, leaving DHCP
still running. When entering L2ConnectedState again, WifiStateMachine gets stuck
on waiting for DhcpStateMachine, because DHCP is already running and the command
CMD_START_DHCP is ignored. Calling handleNetworkDisconnect() when exiting
L2ConnectedState fixes this problem, plus it handles disconnection correctly.
Bug: 10900241
Change-Id: Id29e4989b29db7e64719940cf93eba1f1a90912a
Diffstat (limited to 'wifi/java/android/net')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index 349fe24..de56472 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -3533,10 +3533,7 @@ public class WifiStateMachine extends StateMachine { @Override public void exit() { - // if we're leaving before this is done, cleanup - if (mDhcpActive) { - handlePostDhcpSetup(); - } + handleNetworkDisconnect(); } @Override |