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

Commit bf028210 authored by Michael Lentine's avatar Michael Lentine Committed by Android Git Automerger
Browse files

am 561f697e: am a86465d7: am 8c743655: am cb13da97: Merge "Revert "Dismiss... 

am 561f697e: am a86465d7: am 8c743655: am cb13da97: Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev

* commit '561f697e':
  Revert "Dismiss color fade when it is no longer used."
parents a5940f8d 561f697e

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

+0 −2
Original line number Diff line number Diff line
@@ -837,7 +837,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        if (mPendingScreenOff && target != Display.STATE_OFF) {

            setScreenState(Display.STATE_OFF);

            mPendingScreenOff = false;

            mPowerState.dismissColorFade();

        }



        if (target == Display.STATE_ON) {
@@ -911,7 +910,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                // A black surface is already hiding the contents of the screen.

                setScreenState(Display.STATE_OFF);

                mPendingScreenOff = false;

                mPowerState.dismissColorFade();

            } else if (performScreenOffTransition

                    && mPowerState.prepareColorFade(mContext,

                            mColorFadeFadesConfig ?