Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev (17a76443) · Commits · e / os / android_frameworks_base

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -837,6 +837,7 @@ 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) {
		@@ -910,6 +911,7 @@ 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 ?