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

Author: Jeff Brown

services/java/com/android/server/power/DisplayPowerState.java

@@ -302,8 +302,8 @@ private void invokeCleanListenerIfNeeded() {
         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();
             }