diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-10-09 16:31:35 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2013-10-09 16:31:35 -0700 |
| commit | 8d9167ded3a27607b3f231363a7b224e37d570ad (patch) | |
| tree | 189fb8e3103f3b0b7535174a7843cf4fb4b2d0f7 /wifi | |
| parent | 15af21252db3e45fd18c0db3b535bb8a632267ff (diff) | |
| download | frameworks_base-8d9167ded3a27607b3f231363a7b224e37d570ad.zip frameworks_base-8d9167ded3a27607b3f231363a7b224e37d570ad.tar.gz frameworks_base-8d9167ded3a27607b3f231363a7b224e37d570ad.tar.bz2 | |
Narrow previous fix for this issue.
Networks should be unconditionally disabled when going to
scan only state or we risk connecting when we don't want to.
bug:11062188
Change-Id: If89621ca07d86673a661d2e5fe4ce89286f8835e
Diffstat (limited to 'wifi')
| -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); |