am 99e88721: Merge "Don\'t scale screen brightness by electron beam level." into jb-mr1-dev

* commit '99e88721a8bd19f04278e2fdccd224fc7ee705d4':
  Don't scale screen brightness by electron beam level.
This commit is contained in:
Jeff Brown
2012-10-29 14:11:56 -07:00
committed by Android Git Automerger

View File

@@ -302,8 +302,8 @@ final class DisplayPowerState {
public void run() {
mScreenUpdatePending = false;
if (mPhotonicModulator.setState(mScreenOn,
mScreenOn ? (int)(mScreenBrightness * mElectronBeamLevel) : 0)) {
int brightness = mScreenOn && mElectronBeamLevel > 0f ? mScreenBrightness : 0;
if (mPhotonicModulator.setState(mScreenOn, brightness)) {
mScreenReady = true;
invokeCleanListenerIfNeeded();
}