From 00d5009b0280a2e9854a3d2f35a1613a9b61a1f6 Mon Sep 17 00:00:00 2001
From: David Su <dysu@google.com>
Date: Wed, 25 Sep 2019 19:16:54 -0700
Subject: Start Wifi directly in Client mode

Instead of starting Wifi in Scan only mode,
then enabling client mode, directly start
Wifi in Client mode.

Bug: 141624112
Test: atest FrameworksWifiTests
Test: reboot device and verify Wifi is enabled
Change-Id: Idf7b885cc7e8934112094ed4957be64f4b26386c
---
 service/java/com/android/server/wifi/ActiveModeWarden.java | 4 +++-
 service/java/com/android/server/wifi/WifiServiceImpl.java  | 6 ------
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'service')

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() {
-- 
cgit v1.2.3