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

am 11a3bc70: am 709a4278: Merge "Don\'t mark wifi disabled unless it\'s off." into klp-dev

Browse Source 
* commit '11a3bc702b918e0feb251741e070c37b7a604f25':
  Don't mark wifi disabled unless it's off.
This commit is contained in:
Yuhao Zheng
2013-10-09 16:33:13 -07:00
committed by Android Git Automerger
parent 1bb6a7dce9 11a3bc702b
commit d37638e526
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2957,8 +2957,10 @@ public class WifiStateMachine extends StateMachine {
if (mOperationalMode != CONNECT_MODE) {
mWifiNative.disconnect();
mWifiConfigStore.disableAllNetworks();
setWifiState(WIFI_STATE_DISABLED);
if (mOperationalMode == SCAN_ONLY_WITH_WIFI_OFF_MODE) {
mWifiConfigStore.disableAllNetworks();
setWifiState(WIFI_STATE_DISABLED);
}
transitionTo(mScanModeState);
} else {
/* Driver stop may have disabled networks, enable right after start */