diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-10-09 17:14:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-09 17:14:37 -0700 |
| commit | 6717e1d86fc008adc95eb80bc3fe2a4cc0b29fe9 (patch) | |
| tree | 848d5574ac179c1e6ca39d649ceb5a870ef37871 /wifi/java/android/net | |
| parent | af0a388b7daa270390065c7f658367de5b0abbdb (diff) | |
| parent | 7ecedb75c833a746c561dd0029b0accf175033be (diff) | |
| download | frameworks_base-6717e1d86fc008adc95eb80bc3fe2a4cc0b29fe9.zip frameworks_base-6717e1d86fc008adc95eb80bc3fe2a4cc0b29fe9.tar.gz frameworks_base-6717e1d86fc008adc95eb80bc3fe2a4cc0b29fe9.tar.bz2 | |
am 7ecedb75: am f008ca33: am f681058f: Merge "Narrow previous fix for this issue." into klp-dev
* commit '7ecedb75c833a746c561dd0029b0accf175033be':
Narrow previous fix for this issue.
Diffstat (limited to 'wifi/java/android/net')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index cdafd9e..6b4c580 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -2957,8 +2957,8 @@ public class WifiStateMachine extends StateMachine { if (mOperationalMode != CONNECT_MODE) { mWifiNative.disconnect(); + mWifiConfigStore.disableAllNetworks(); if (mOperationalMode == SCAN_ONLY_WITH_WIFI_OFF_MODE) { - mWifiConfigStore.disableAllNetworks(); setWifiState(WIFI_STATE_DISABLED); } transitionTo(mScanModeState); |