am 05caa2a3: Apply scan-always setting to initial wifi state.

* commit '05caa2a3de32e54562d1ec3031f73ef5392cfb40': Apply scan-always setting to initial wifi state.
2013-06-03 08:41:48 -07:00
parent 66c7bd5404 05caa2a3de
commit 530098327c
1 changed files with 5 additions and 1 deletions
--- a/services/java/com/android/server/wifi/WifiController.java
+++ b/services/java/com/android/server/wifi/WifiController.java
@@ -150,7 +150,11 @@ class WifiController extends StateMachine {
            addState(mStaDisabledWithScanState, mDefaultState);
            addState(mApEnabledState, mDefaultState);
            addState(mEcmState, mDefaultState);
-        setInitialState(mApStaDisabledState);
+        if (mSettingsStore.isScanAlwaysAvailable()) {
+            setInitialState(mStaDisabledWithScanState);
+        } else {
+            setInitialState(mApStaDisabledState);
+        }
        setLogRecSize(100);
        setLogOnlyTransitions(false);