diff options
| author | Randy Pan <zpan@google.com> | 2016-05-23 17:00:24 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-23 17:00:24 +0000 |
| commit | 252a57a58d7173cc379ad18ea2942225c5a2cdbb (patch) | |
| tree | fe318d8140aa96352aab96701c4775f6a0486d23 | |
| parent | 7c7c65c372b55da9e9662a708884fca18ddfebc0 (diff) | |
| parent | 5de778c46065cf6a72c2c0d124c0ac882e5b55fe (diff) | |
Merge "Inform WifiConnectivityManager screen state" into nyc-dev
am: 5de778c460
* commit '5de778c46065cf6a72c2c0d124c0ac882e5b55fe':
Inform WifiConnectivityManager screen state
Change-Id: Iff14d57ecc30ce3a80adf024c1147dee1acb13b3
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index c92d0c803..da39371c8 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -4706,6 +4706,11 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss // Set the right suspend mode settings mWifiNative.setSuspendOptimizations(mSuspendOptNeedsDisabled == 0 && mUserWantsSuspendOpt.get()); + + // Inform WifiConnectivtyManager the screen state in case + // WifiConnectivityManager missed the last screen update because + // it was not started yet. + mWifiConnectivityManager.handleScreenStateChanged(mScreenOn); } mWifiNative.setPowerSave(true); |