From b131c7003b73c84999b4aa76da853d08a681949f Mon Sep 17 00:00:00 2001
From: Chong Zhang <chz@google.com>
Date: Tue, 16 Feb 2016 16:31:48 -0800
Subject: [PATCH] Clear mPendingScreenOff and stop color fade animiation if
 screen is on

bug: 24116819
Change-Id: I4a962878001b00daf5473d90cbd257ac318c0446
---
 .../com/android/server/display/DisplayPowerController.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index b74b0f2e3caa1..1038d975ef558 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -840,7 +840,11 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
         // If there is already an animation in progress, don't interfere with it.
         if (mColorFadeOnAnimator.isStarted()
                 || mColorFadeOffAnimator.isStarted()) {
-            return;
+            if (target != Display.STATE_ON) {
+                return;
+            }
+            // If display state changed to on, proceed and stop the color fade and turn screen on.
+            mPendingScreenOff = false;
         }
 
         // If we were in the process of turning off the screen but didn't quite