commit 0f3d0612b649731a084a791a6cc6fa1b74fcd1a1
author Michael Lentine <mlentine@google.com> Wed Sep 23 05:33:05 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 23 05:33:05 2015 +0000
tree 71870ac51f705c49f1543529c2f3c2b2979fb643
parent 7b9bcf02e1954b48a80a9e43df5b25d875172730
parent 0d93002af027044070a554d553ab524564404b18

am 0d93002a: am 17a76443: Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev

* commit '0d93002af027044070a554d553ab524564404b18':
  Dismiss color fade when it is no longer used.

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

diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index 452378f..533f425 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -837,6 +837,7 @@
         if (mPendingScreenOff && target != Display.STATE_OFF) {
             setScreenState(Display.STATE_OFF);
             mPendingScreenOff = false;
+            mPowerState.dismissColorFade();
         }
 
         if (target == Display.STATE_ON) {
@@ -910,6 +911,7 @@
                 // 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 ?