diff options
| author | Yuhao Zheng <yuhaozheng@google.com> | 2013-10-10 09:27:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-10 09:27:55 -0700 |
| commit | 9787b10342c33a9d6e4dccc885b904c9c5ea6704 (patch) | |
| tree | aaf15aeec35262c171fda0d94c3f33bbd7881b46 /wifi | |
| parent | afa58079ccdcefbc84defb5ea02cbcdfe2f3ef76 (diff) | |
| parent | 86f48113a5ee0f2d15ba9650b4335ba063ef48ad (diff) | |
| download | frameworks_base-9787b10342c33a9d6e4dccc885b904c9c5ea6704.zip frameworks_base-9787b10342c33a9d6e4dccc885b904c9c5ea6704.tar.gz frameworks_base-9787b10342c33a9d6e4dccc885b904c9c5ea6704.tar.bz2 | |
am 86f48113: am 623dddc9: am 3309bc5f: Merge "WifiStateMachine: fix for exiting L2ConnectedState" into klp-dev
* commit '86f48113a5ee0f2d15ba9650b4335ba063ef48ad':
WifiStateMachine: fix for exiting L2ConnectedState
Diffstat (limited to 'wifi')
| -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 6b4c580..b4c583e 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -3535,10 +3535,7 @@ public class WifiStateMachine extends StateMachine { @Override public void exit() { - // if we're leaving before this is done, cleanup - if (mDhcpActive) { - handlePostDhcpSetup(); - } + handleNetworkDisconnect(); } @Override |