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

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

View File

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