Merge "Fix ClientMode initialization order" into qt-dev

am: 5571ad3446

Change-Id: I385c670e33dd3d57c635986c5daa06d57d96d2a6

3 files changed, 11 insertions, 3 deletions

diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java
index f35785645..d98d022b7 100644
--- a/service/java/com/android/server/wifi/ClientModeImpl.java
+++ b/service/java/com/android/server/wifi/ClientModeImpl.java
@@ -906,9 +906,13 @@ public class ClientModeImpl extends StateMachine {
 
         setLogRecSize(NUM_LOG_RECS_NORMAL);
         setLogOnlyTransitions(false);
+    }
 
-        //start the state machine
-        start();
+    @Override
+    public void start() {
+        super.start();
+
+        PowerManager powerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
 
         // Learn the initial state of whether the screen is on.
         // We update this field when we receive broadcasts from the system.
@@ -2594,7 +2598,9 @@ public class ClientModeImpl extends StateMachine {
         mNetworkFactory.handleScreenStateChanged(screenOn);
 
         WifiLockManager wifiLockManager = mWifiInjector.getWifiLockManager();
-        if (wifiLockManager != null) {
+        if (wifiLockManager == null) {
+            Log.w(TAG, "WifiLockManager not initialized, skipping screen state notification");
+        } else {
             wifiLockManager.handleScreenStateChanged(screenOn);
         }
 
diff --git a/service/java/com/android/server/wifi/WifiInjector.java b/service/java/com/android/server/wifi/WifiInjector.java
index 8e88ca559..178c98f6d 100644
--- a/service/java/com/android/server/wifi/WifiInjector.java
+++ b/service/java/com/android/server/wifi/WifiInjector.java
@@ -346,6 +346,7 @@ public class WifiInjector {
         mWifiNetworkSelector.registerNetworkEvaluator(mCarrierNetworkEvaluator);
         mWifiNetworkSelector.registerNetworkEvaluator(mScoredNetworkEvaluator);
 
+        mClientModeImpl.start();
     }
 
     /**
diff --git a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java
index 026b3a44e..b64bf3de5 100644
--- a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java
@@ -546,6 +546,7 @@ public class ClientModeImplTest {
                 mUserManager, mWifiInjector, mBackupManagerProxy, mCountryCode, mWifiNative,
                 mWrongPasswordNotifier, mSarManager, mWifiTrafficPoller,
                 mLinkProbeManager);
+        mCmi.start();
         mWifiCoreThread = getCmiHandlerThread(mCmi);
 
         registerAsyncChannel((x) -> {