Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ba6f668 authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

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

* commit 'c5bfe196':
  Fix screen timeout determination for starting dream.
parents 61077382 c5bfe196

services/java/com/android/server/power/PowerManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -1830,8 +1830,8 @@ public class PowerManagerService extends IPowerManager.Stub 


            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");

                    }