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.

1 files changed, 2 insertions, 2 deletions

diff --git a/services/java/com/android/server/power/DisplayPowerState.java b/services/java/com/android/server/power/DisplayPowerState.java
index 6bb7ec5946e8..fa318f8b6198 100644
--- 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();
             }