commit 90e96db0b5a200f528f1ca6a66d5aeaa5c915ca2
author Vinod Krishnan <vinodkrishnan@google.com> Thu Jun 05 23:03:48 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 05 23:03:49 2014 +0000
tree 2a70ff04ed51c65a47dbbcffe085929ee0b2b784
parent 42db3761c9ee3df11a367cbc907f2ba433251634
parent b0e5bbb657c59584c37a489c93a3a12d13ca56b7

Merge "Adding a way to stub Vpn ConfirmDialog" into klp-modular-dev

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 47406a1..1a36cbf 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -706,8 +706,14 @@
                 // Turn the screen on.  The contents of the screen may not yet
                 // be visible if the electron beam has not been dismissed because
                 // its last frame of animation is solid black.
-                setScreenState(mPowerRequest.screenState == DisplayPowerRequest.SCREEN_STATE_DOZE
-                        ? Display.STATE_DOZING : Display.STATE_ON);
+
+                if (mPowerRequest.screenState == DisplayPowerRequest.SCREEN_STATE_DOZE) {
+                    if (!mScreenBrightnessRampAnimator.isAnimating()) {
+                        setScreenState(Display.STATE_DOZING);
+                    }
+                } else {
+                    setScreenState(Display.STATE_ON);
+                }
 
                 if (mPowerRequest.blockScreenOn
                         && mPowerState.getElectronBeamLevel() == 0.0f) {