diff options
author | Robert Greenwalt <rgreenwalt@google.com> | 2013-06-01 10:59:29 -0700 |
---|---|---|
committer | The Android Automerger <android-build@android.com> | 2013-06-03 15:03:36 -0700 |
commit | b0a88e5716ac2b325b4d79a5c12e726db4ee51df (patch) | |
tree | e057d522dfcef945018449b21770b73d4816649b | |
parent | 9c7ee73d9c46d7338ce2881285bd38792c5e570f (diff) | |
download | base-b0a88e5716ac2b325b4d79a5c12e726db4ee51df.tar.gz |
Apply scan-always setting to initial wifi state.
Otherwise there's nothing to kick us into scanable modes unless
the user toggles wifi.
bug:9217455
Change-Id: I6460305e3f299646433546598412f817579cc805
-rw-r--r-- | services/java/com/android/server/wifi/WifiController.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/services/java/com/android/server/wifi/WifiController.java b/services/java/com/android/server/wifi/WifiController.java index 228fabf67a04..87b43946a73a 100644 --- 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); |