diff options
| author | 2013-04-12 21:10:52 +0000 | |
|---|---|---|
| committer | 2013-04-12 21:10:53 +0000 | |
| commit | e203384f1627f27c81ff72426498927fb9d80698 (patch) | |
| tree | 131b2094590fab72c6d2e2180d905b289d8e04f6 | |
| parent | 03499a23f9d84fab95a7383b50cc7f87a974e4a8 (diff) | |
| parent | a05e4583af6d43f5d19fd6f508501bc43ccfcd5b (diff) | |
Merge "Disconnect from AP when teardown requested." into jb-mr2-dev
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index 04e7095cc6df..a5d98cc1f4d4 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -2442,6 +2442,9 @@ public class WifiStateMachine extends StateMachine { 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 @@ public class WifiStateMachine extends StateMachine { 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: |