diff options
| author | Yuhao Zheng <yuhaozheng@google.com> | 2013-10-10 16:18:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-10 16:18:59 +0000 |
| commit | 3309bc5f249d971a19c3db376dd94e28819fded3 (patch) | |
| tree | aaeef03c0d518b7a4f5e28fcf96bc616c4e5cc46 /wifi/java/android | |
| parent | 5bd70c5eb3ccb5d1eed3f1f7e924a4fb96b0a053 (diff) | |
| parent | a9e6be83aeafd6e97e5eb52e12766b476ab94da0 (diff) | |
| download | frameworks_base-3309bc5f249d971a19c3db376dd94e28819fded3.zip frameworks_base-3309bc5f249d971a19c3db376dd94e28819fded3.tar.gz frameworks_base-3309bc5f249d971a19c3db376dd94e28819fded3.tar.bz2 | |
Merge "WifiStateMachine: fix for exiting L2ConnectedState" into klp-dev
Diffstat (limited to 'wifi/java/android')
| -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 |