Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 88b7016a39

Change-Id: Ic01e859088dbfe6f30b8530b459e701b0d5255b5
This commit is contained in:
Lucas Dupin
2017-08-17 03:14:09 +00:00
committed by android-build-merger
parent 1f57cea5f4 88b7016a39
commit 04bc292787
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/display/DisplayPowerController.java
View File

@@ -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