Merge "Don't scale screen brightness by electron beam level." into jb-mr1-dev (99e88721) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -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();
		}