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

Commit 42db3761 authored by Prashant Malani's avatar Prashant Malani Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Change display state modification during dozing" into klp-modular-dev

parents 89b6bf5a 448a4e59

services/core/java/com/android/server/display/DisplayPowerController.java

+8 −2
Original line number Diff line number Diff line
@@ -706,8 +706,14 @@ final class DisplayPowerController { 
                // Turn the screen on.  The contents of the screen may not yet

                // be visible if the electron beam has not been dismissed because

                // its last frame of animation is solid black.

                setScreenState(mPowerRequest.screenState == DisplayPowerRequest.SCREEN_STATE_DOZE

                        ? Display.STATE_DOZING : Display.STATE_ON);



                if (mPowerRequest.screenState == DisplayPowerRequest.SCREEN_STATE_DOZE) {

                    if (!mScreenBrightnessRampAnimator.isAnimating()) {

                        setScreenState(Display.STATE_DOZING);

                    }

                } else {

                    setScreenState(Display.STATE_ON);

                }



                if (mPowerRequest.blockScreenOn

                        && mPowerState.getElectronBeamLevel() == 0.0f) {