commit e203384f1627f27c81ff72426498927fb9d80698
author Robert Greenwalt <rgreenwalt@google.com> Fri Apr 12 21:10:52 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 12 21:10:53 2013 +0000
tree 131b2094590fab72c6d2e2180d905b289d8e04f6
parent 03499a23f9d84fab95a7383b50cc7f87a974e4a8
parent a05e4583af6d43f5d19fd6f508501bc43ccfcd5b

Merge "Disconnect from AP when teardown requested." into jb-mr2-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 04e7095..a5d98cc 100644
--- a/wifi/java/android/net/wifi/WifiStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiStateMachine.java
@@ -2442,6 +2442,9 @@
                         if (DBG) log("Already in delayed stop");
                         break;
                     }
+                    /* disconnect right now, but leave the driver running for a bit */
+                    mWifiConfigStore.disableAllNetworks();
+
                     mInDelayedStop = true;
                     mDelayedStopCounter++;
                     if (DBG) log("Delayed stop message " + mDelayedStopCounter);
@@ -2462,6 +2465,9 @@
                         mDelayedStopCounter++;
                         mAlarmManager.cancel(mDriverStopIntent);
                         if (DBG) log("Delayed stop ignored due to start");
+                        if (mOperationalMode == CONNECT_MODE) {
+                            mWifiConfigStore.enableAllNetworks();
+                        }
                     }
                     break;
                 case CMD_DELAYED_STOP_DRIVER: