Merge "Use config.xml as brightness default fallback." into sc-dev (2188e522) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/display/DisplayDeviceConfig.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -422,7 +422,7 @@ public class DisplayDeviceConfig {
		if (configBrightnessDefault != null) {
		mBrightnessDefault = configBrightnessDefault.floatValue();
		} else {
		mBrightnessDefault = BRIGHTNESS_DEFAULT;
		loadBrightnessDefaultFromConfigXml();
		}
		}
		}

+5 −1

Original line number	Diff line number	Diff line
		@@ -1362,6 +1362,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
		+ mBrightnessReasonTemp.toString(brightnessAdjustmentFlags)
		+ "', previous reason: '" + mBrightnessReason + "'.");
		mBrightnessReason.set(mBrightnessReasonTemp);
		} else if (mBrightnessReasonTemp.reason == BrightnessReason.REASON_MANUAL
		&& userSetBrightnessChanged) {
		Slog.v(TAG, "Brightness [" + brightnessState + "] manual adjustment.");
		}

		// Update display white-balance.
		@@ -2021,7 +2024,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
		\|\| mPendingScreenBrightnessSetting < 0.0f)) {
		return false;
		}
		if (mCurrentScreenBrightnessSetting == mPendingScreenBrightnessSetting) {
		if (BrightnessSynchronizer.floatEquals(
		mCurrentScreenBrightnessSetting, mPendingScreenBrightnessSetting)) {
		mPendingScreenBrightnessSetting = PowerManager.BRIGHTNESS_INVALID_FLOAT;
		mTemporaryScreenBrightness = PowerManager.BRIGHTNESS_INVALID_FLOAT;
		return false;