diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-11 03:12:13 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-11 03:12:13 +0000 |
commit | e95cf3828638fd353fe057222aae890d5861b4bd (patch) | |
tree | f5e6ec318b061bf51c7edd9e35f3e594676c036e | |
parent | de264fc854c4314ce7b4f2c1b92c3d3e5b15df99 (diff) | |
parent | 5571ad34461466bc053c85628920957daa35d1db (diff) | |
download | android_frameworks_opt_net_wifi-e95cf3828638fd353fe057222aae890d5861b4bd.tar.gz android_frameworks_opt_net_wifi-e95cf3828638fd353fe057222aae890d5861b4bd.tar.bz2 android_frameworks_opt_net_wifi-e95cf3828638fd353fe057222aae890d5861b4bd.zip |
Snap for 5649081 from 5571ad34461466bc053c85628920957daa35d1db to qt-release
Change-Id: I6d3775e4bcc9bc5a556deda234941bcf6d164edf
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) -> { |