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

John Spurlock · Android (Google) Code Review · commit c5bfe1962626 · 2012-08-09T15:43:25.000-07:00
diff --git a/services/java/com/android/server/power/PowerManagerService.java b/services/java/com/android/server/power/PowerManagerService.java
@@ -1830,8 +1830,8 @@ private void setPowerState(int newState, boolean noChangeLights, int reason)
 
             final boolean stateChanged = mPowerState != newState;
 
-            if (stateChanged && reason == WindowManagerPolicy.OFF_BECAUSE_OF_TIMEOUT) {
-                if (mPolicy != null && mPolicy.isScreenSaverEnabled() && mIsPowered) {
+            if (stateChanged && !newScreenOn && reason == WindowManagerPolicy.OFF_BECAUSE_OF_TIMEOUT) {
+                if (mPolicy != null && mIsPowered && mPolicy.isScreenSaverEnabled()) {
                     if (DEBUG) {
                         Slog.d(TAG, "setPowerState: running screen saver instead of turning off screen");
                     }

Original file line number	Diff line number	Diff line change
`@@ -1830,8 +1830,8 @@ private void setPowerState(int newState, boolean noChangeLights, int reason)`
`1830`	`1830`
`1831`	`1831`	`final boolean stateChanged = mPowerState != newState;`
`1832`	`1832`
`1833`		`- if (stateChanged && reason == WindowManagerPolicy.OFF_BECAUSE_OF_TIMEOUT) {`
`1834`		`- if (mPolicy != null && mPolicy.isScreenSaverEnabled() && mIsPowered) {`
	`1833`	`+ if (stateChanged && !newScreenOn && reason == WindowManagerPolicy.OFF_BECAUSE_OF_TIMEOUT) {`
	`1834`	`+ if (mPolicy != null && mIsPowered && mPolicy.isScreenSaverEnabled()) {`
`1835`	`1835`	`if (DEBUG) {`
`1836`	`1836`	`Slog.d(TAG, "setPowerState: running screen saver instead of turning off screen");`
`1837`	`1837`	`}`