Set the brightness to zero on screen-off

Iliyan Malchev · Iliyan Malchev · commit 122415f5c813 · 2012-08-16T12:48:28.000-07:00
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 &lt;malchev@google.com&gt;
diff --git a/services/java/com/android/server/power/DisplayPowerState.java b/services/java/com/android/server/power/DisplayPowerState.java
@@ -242,8 +242,8 @@ private void apply() {
                 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) {

Original file line number	Diff line number	Diff line change
`@@ -242,8 +242,8 @@ private void apply() {`
`242`	`242`	`mElectronBeam.draw(mElectronBeamLevel);`
`243`	`243`	`}`
`244`	`244`
`245`		`- if ((mDirty & DIRTY_BRIGHTNESS) != 0) {`
`246`		`- mScreenBrightnessModulator.setBrightness(mScreenBrightness);`
	`245`	`+ if ((mDirty & (DIRTY_BRIGHTNESS \| DIRTY_SCREEN_ON)) != 0) {`
	`246`	`+ mScreenBrightnessModulator.setBrightness(mScreenOn ? mScreenBrightness : 0);`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`if ((mDirty & DIRTY_SCREEN_ON) != 0 && mScreenOn) {`