commit e78d7670ca6d0f7cd66edeef791978234dd8d857
author Dima Zavin <dima@android.com> Mon Mar 05 13:19:33 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 05 13:19:33 2012 -0800
tree d75b07a9398c39b9330a5c9d6d4cbf81f20aa474
parent c8a0a159949a8b975b7e48a66f7034e2748f367d
parent d975403a2dc71132cab1f6bfa111a9b353f307f8

Merge "PowerManagerService: only turn off screen when we really mean to"

services/java/com/android/server/PowerManagerService.java

diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
index c8f49ee..d9d3f4e 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -2235,7 +2235,7 @@
 
                 if (target != currentValue) {
                     final boolean turningOff = endValue == Power.BRIGHTNESS_OFF;
-                    if (turningOff) {
+                    if (turningOff && ((mask & (SCREEN_ON_BIT | SCREEN_BRIGHT_BIT)) != 0)) {
                         // Cancel all pending animations since we're turning off
                         mScreenBrightnessHandler.removeCallbacksAndMessages(null);
                         screenOffFinishedAnimatingLocked(mScreenOffReason);