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

Commit a84952bc authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Fix null pointer when mColorFadeEnabled is false 

mColorFadeOffAnimator and mColorFadeOnAnimator won't ever
be initialized if mColorFadeEnabled is set to false.
This means that we can't assume that these animators always exist.

Test: Manual, lock, unlock device
Change-Id: I0cb7a10f7d311bc992c4a3e1b4943b454e39ec1a
Fixes: 64726143
parent 73e3d9f5

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