Merge "Don't scale screen brightness by electron beam level." into jb-mr1-dev

2012-10-28 17:01:29 -07:00
parent 7b9a28892b 356bd4cf2c
commit 99e88721a8
1 changed files with 2 additions and 2 deletions
--- a/services/java/com/android/server/power/DisplayPowerState.java
+++ b/services/java/com/android/server/power/DisplayPowerState.java
@ -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();
            }