From 122415f5c813408fe2c7b81e33144f2beff9c3d5 Mon Sep 17 00:00:00 2001 From: Iliyan Malchev Date: Thu, 16 Aug 2012 12:47:21 -0700 Subject: [PATCH] Set the brightness to zero on screen-off Fixes b/6996990 Ideally, the HWC HAL should turn off the backlight when the display is turned off. This patch enforces this at the PowerManager, which can guard against errant HWC implementations. Change-Id: Ibb826a02871c983f8a68034d010e68abe9c5c1d5 Signed-off-by: Iliyan Malchev --- services/java/com/android/server/power/DisplayPowerState.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/java/com/android/server/power/DisplayPowerState.java b/services/java/com/android/server/power/DisplayPowerState.java index ad242c08fcbcb..f61872537e572 100644 --- a/services/java/com/android/server/power/DisplayPowerState.java +++ b/services/java/com/android/server/power/DisplayPowerState.java @@ -242,8 +242,8 @@ final class DisplayPowerState { mElectronBeam.draw(mElectronBeamLevel); } - if ((mDirty & DIRTY_BRIGHTNESS) != 0) { - mScreenBrightnessModulator.setBrightness(mScreenBrightness); + if ((mDirty & (DIRTY_BRIGHTNESS | DIRTY_SCREEN_ON)) != 0) { + mScreenBrightnessModulator.setBrightness(mScreenOn ? mScreenBrightness : 0); } if ((mDirty & DIRTY_SCREEN_ON) != 0 && mScreenOn) {