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

Commit c5bfe196 authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

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

parents a7bbbabc b9ba2b67

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

                    }