diff options
| author | Dima Zavin <dima@android.com> | 2012-03-05 09:55:41 -0800 |
|---|---|---|
| committer | Dima Zavin <dima@android.com> | 2012-03-05 13:13:33 -0800 |
| commit | d975403a2dc71132cab1f6bfa111a9b353f307f8 (patch) | |
| tree | f150df23689531e0857821c00b599dcb7cb5ecd8 /services/java/com/android/server/PowerManagerService.java | |
| parent | e6e47f0517b98055625abc21a85eaa702374495a (diff) | |
PowerManagerService: only turn off screen when we really mean to
Change-Id: I8aa574b38a4d901fce91b6d7771207949f9c8044
Signed-off-by: Dima Zavin <dima@android.com>
Diffstat (limited to 'services/java/com/android/server/PowerManagerService.java')
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index c8f49ee2cb80..d9d3f4e61ad0 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -2235,7 +2235,7 @@ public class PowerManagerService extends IPowerManager.Stub 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); |