diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-06-03 08:41:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-03 08:41:48 -0700 |
| commit | 530098327c19cfa3c31c4eabe316bf36ad4a848c (patch) | |
| tree | f4a3ebdf8cc98638d01a82447fd53c609aec10d2 /services | |
| parent | 66c7bd54046c567de5e3a4d332987a28ecb78092 (diff) | |
| parent | 05caa2a3de32e54562d1ec3031f73ef5392cfb40 (diff) | |
| download | frameworks_base-530098327c19cfa3c31c4eabe316bf36ad4a848c.zip frameworks_base-530098327c19cfa3c31c4eabe316bf36ad4a848c.tar.gz frameworks_base-530098327c19cfa3c31c4eabe316bf36ad4a848c.tar.bz2 | |
am 05caa2a3: Apply scan-always setting to initial wifi state.
* commit '05caa2a3de32e54562d1ec3031f73ef5392cfb40':
Apply scan-always setting to initial wifi state.
Diffstat (limited to 'services')
| -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 228fabf..87b4394 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); |