From 68eafe7f883d9963f0b91506b9e618766c854b49 Mon Sep 17 00:00:00 2001
From: Michael Lentine <mlentine@google.com>
Date: Thu, 24 Sep 2015 16:58:46 -0700
Subject: Revert "Dismiss color fade when it is no longer used."

Bug: 24371570
This reverts commit 193560002fbc080f0006df088f8f5e9c165bfd78.
---
 .../core/java/com/android/server/display/DisplayPowerController.java    | 2 --
 1 file changed, 2 deletions(-)

(limited to 'services')

diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index 533f425..452378f 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 ?
-- 
cgit v1.1