diff options
| author | David Christie <dnchrist@google.com> | 2014-09-15 16:08:49 -0700 |
|---|---|---|
| committer | David Christie <dnchrist@google.com> | 2014-09-16 14:30:28 -0700 |
| commit | 7b160c8a00773246660caeae9e27090c83ed6ed5 (patch) | |
| tree | f559d7d9734ccf78dff250dd6d465485b695ec6d /service/java/com/android/server/wifi/WifiController.java | |
| parent | 7988fcae6f9cf8be0063a70b42ef58a4fa7feb84 (diff) | |
| download | frameworks_opt_net_wifi-7b160c8a00773246660caeae9e27090c83ed6ed5.tar.gz frameworks_opt_net_wifi-7b160c8a00773246660caeae9e27090c83ed6ed5.tar.bz2 frameworks_opt_net_wifi-7b160c8a00773246660caeae9e27090c83ed6ed5.zip | |
Fix bug where wifi scan only mode is non-functional after toggling airplane mode.
Bug: 17507663
Change-Id: I0d77c2e29b78fdfa8e9f4be31181145cb29c1499
Diffstat (limited to 'service/java/com/android/server/wifi/WifiController.java')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiController.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiController.java b/service/java/com/android/server/wifi/WifiController.java index e5389a1..8f36cb7 100644 --- a/service/java/com/android/server/wifi/WifiController.java +++ b/service/java/com/android/server/wifi/WifiController.java @@ -160,7 +160,7 @@ class WifiController extends StateMachine { ", isWifiEnabled = " + isWifiEnabled + ", isScanningAvailable = " + isScanningAlwaysAvailable); - if (isWifiEnabled && isScanningAlwaysAvailable) { + if (isScanningAlwaysAvailable) { setInitialState(mStaDisabledWithScanState); } else { setInitialState(mApStaDisabledState); @@ -418,6 +418,8 @@ class WifiController extends StateMachine { } else { checkLocksAndTransitionWhenDeviceIdle(); } + } else if (mSettingsStore.isScanAlwaysAvailable()) { + transitionTo(mStaDisabledWithScanState); } break; case CMD_SCAN_ALWAYS_MODE_CHANGED: |