commit 3309bc5f249d971a19c3db376dd94e28819fded3
author Yuhao Zheng <yuhaozheng@google.com> Thu Oct 10 16:18:59 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 10 16:18:59 2013 +0000
tree aaeef03c0d518b7a4f5e28fcf96bc616c4e5cc46
parent 5bd70c5eb3ccb5d1eed3f1f7e924a4fb96b0a053
parent a9e6be83aeafd6e97e5eb52e12766b476ab94da0

Merge "WifiStateMachine: fix for exiting L2ConnectedState" into klp-dev

wifi/java/android/net/wifi/WifiStateMachine.java

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 @@
 
         @Override
         public void exit() {
-            // if we're leaving before this is done, cleanup
-            if (mDhcpActive) {
-                handlePostDhcpSetup();
-            }
+            handleNetworkDisconnect();
         }
 
         @Override