Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disconnect from AP when teardown requested." into jb-mr2-dev

Browse Source
This commit is contained in:
Robert Greenwalt
2013-04-12 21:10:52 +00:00
committed by Android (Google) Code Review
parent 03499a23f9 a05e4583af
commit e203384f16
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wifi/java/android/net/wifi/WifiStateMachine.java
View File

@@ -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: