diff options
| author | David Su <dysu@google.com> | 2019-09-26 18:06:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-09-26 18:06:38 +0000 |
| commit | 029454382657b338cff31208656f1bca6f504ca0 (patch) | |
| tree | 7227ee585681442c0311bb32cdc5a3a98a7e4a1c /service | |
| parent | 97447d4b970bf7e569d10dc6ca5829d99e9a4e44 (diff) | |
| parent | 00d5009b0280a2e9854a3d2f35a1613a9b61a1f6 (diff) | |
Merge "Start Wifi directly in Client mode"
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/ActiveModeWarden.java | 4 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/WifiServiceImpl.java | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/service/java/com/android/server/wifi/ActiveModeWarden.java b/service/java/com/android/server/wifi/ActiveModeWarden.java index 4f1a00371..adc708e1c 100644 --- a/service/java/com/android/server/wifi/ActiveModeWarden.java +++ b/service/java/com/android/server/wifi/ActiveModeWarden.java @@ -437,7 +437,9 @@ public class ActiveModeWarden { + ", isScanningAvailable = " + isScanningAlwaysAvailable + ", isLocationModeActive = " + isLocationModeActive); - if (checkScanOnlyModeAvailable()) { + if (mSettingsStore.isWifiToggleEnabled()) { + setInitialState(mStaEnabledState); + } else if (checkScanOnlyModeAvailable()) { setInitialState(mStaDisabledWithScanState); } else { setInitialState(mStaDisabledState); diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java index 47c52531f..6bab1eafe 100644 --- a/service/java/com/android/server/wifi/WifiServiceImpl.java +++ b/service/java/com/android/server/wifi/WifiServiceImpl.java @@ -349,12 +349,6 @@ public class WifiServiceImpl extends BaseWifiService { Log.wtf(TAG, "Failed to initialize ClientModeImpl"); } mActiveModeWarden.start(); - - // If we are already disabled (could be due to airplane mode), avoid changing persist - // state here - if (wifiEnabled) { - setWifiEnabled(mContext.getPackageName(), true); - } } public void handleBootCompleted() { |