am cb13da97: Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev

* commit 'cb13da9772b41c3466c3ed514e6321c2cfb85c2a':
  Revert "Dismiss color fade when it is no longer used."

1 files changed, 0 insertions, 2 deletions

diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index 533f425e33f7..452378ff1e45 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -837,7 +837,6 @@ 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) {
@@ -911,7 +910,6 @@ 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 ?