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

Commit 04bc2927 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Merge "Fix null pointer when mColorFadeEnabled is false" into... 

Merge "Merge "Fix null pointer when mColorFadeEnabled is false" into oc-mr1-dev am: a4b6b9d2" into oc-mr1-dev-plus-aosp
am: 88b7016a

Change-Id: Ic01e859088dbfe6f30b8530b459e701b0d5255b5
parents 1f57cea5 88b7016a

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

+3 −1
Original line number Diff line number Diff line
@@ -1010,7 +1010,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
            // contents of the screen.

            mPowerState.prepareColorFade(mContext,

                    mColorFadeFadesConfig ? ColorFade.MODE_FADE : ColorFade.MODE_WARM_UP);

            if (mColorFadeOffAnimator != null) {

                mColorFadeOffAnimator.end();

            }

            // Some display hardware will blank itself on the transition between doze and non-doze

            // but still on display states. In this case we want to report to policy that the

            // display has turned off so it can prepare the appropriate power on animation, but we