diff options
| -rw-r--r-- | services/core/java/com/android/server/display/DisplayPowerController.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index fb8ae1247796..e316fff884a5 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -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); - mColorFadeOffAnimator.end(); + 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 |