Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix screen timeout determination for starting dream." into jb-mr1-dev

Browse Source
This commit is contained in:
John Spurlock
2012-08-09 15:43:24 -07:00
committed by Android (Google) Code Review
parent a7bbbabc15 b9ba2b6768
commit c5bfe19626
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/power/PowerManagerService.java
View File

@@ -1830,8 +1830,8 @@ public class PowerManagerService extends IPowerManager.Stub
final boolean stateChanged = mPowerState != newState; final boolean stateChanged = mPowerState != newState;
if (stateChanged && reason == WindowManagerPolicy.OFF_BECAUSE_OF_TIMEOUT) { if (stateChanged && !newScreenOn && reason == WindowManagerPolicy.OFF_BECAUSE_OF_TIMEOUT) {
if (mPolicy != null && mPolicy.isScreenSaverEnabled() && mIsPowered) { if (mPolicy != null && mIsPowered && mPolicy.isScreenSaverEnabled()) {
if (DEBUG) { if (DEBUG) {
Slog.d(TAG, "setPowerState: running screen saver instead of turning off screen"); Slog.d(TAG, "setPowerState: running screen saver instead of turning off screen");
} }