diff options
| author | Yuhao Zheng <yuhaozheng@google.com> | 2013-10-09 16:36:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-09 16:36:36 -0700 |
| commit | f3346191f8b84db90572abef94212c272347e99d (patch) | |
| tree | d19d99235e40ec2dae0df3ed0c34998308a20e2e /wifi/java/android/net | |
| parent | bd88529d282c0b22bf11d09f9134cd47b779d920 (diff) | |
| parent | d37638e5262fea65bf428cb78e73a9b4e02a93fe (diff) | |
| download | frameworks_base-f3346191f8b84db90572abef94212c272347e99d.zip frameworks_base-f3346191f8b84db90572abef94212c272347e99d.tar.gz frameworks_base-f3346191f8b84db90572abef94212c272347e99d.tar.bz2 | |
am d37638e5: am 11a3bc70: am 709a4278: Merge "Don\'t mark wifi disabled unless it\'s off." into klp-dev
* commit 'd37638e5262fea65bf428cb78e73a9b4e02a93fe':
Don't mark wifi disabled unless it's off.
Diffstat (limited to 'wifi/java/android/net')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index 349fe24..cdafd9e 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -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 */ |