diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-10-08 17:43:33 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2013-10-09 12:48:07 -0700 |
| commit | 15af21252db3e45fd18c0db3b535bb8a632267ff (patch) | |
| tree | f49fd744d71942360e88aac567de0744d95b137a /wifi/java | |
| parent | b3a69c5dc3ee39cfb2a06660f0953c4c7b55d21a (diff) | |
| download | frameworks_base-15af21252db3e45fd18c0db3b535bb8a632267ff.zip frameworks_base-15af21252db3e45fd18c0db3b535bb8a632267ff.tar.gz frameworks_base-15af21252db3e45fd18c0db3b535bb8a632267ff.tar.bz2 | |
Don't mark wifi disabled unless it's off.
The transition from driver-started to scan-only state was incorrectly
always marking wifi disabled, but transitioning back only marked it
enabled if we were exiting due to leaving the scan-only-with-wifi-off
mode.
bug:11062188
Change-Id: I44fe64fd8dac8f36f4e22cb1c16b9d7a06bdbac0
Diffstat (limited to 'wifi/java')
| -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 */ |