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

* commit 'ee98610f1af9c12fcb89522cf1795470bec60938':
  Set the brightness to zero on screen-off
This commit is contained in:
Iliyan Malchev
2012-08-16 13:45:01 -07:00
committed by Android Git Automerger

View File

@@ -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) {