Merge "Set the brightness to zero on screen-off" into jb-mr1-dev

Iliyan Malchev · Android (Google) Code Review · commit ee98610f1af9 · 2012-08-16T13:43:14.000-07:00
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) {`