Merge "Don't treat user switch as a brightness slider interaction" into tm-qpr-dev (25db0bee) · Commits · e / os / android_frameworks_base

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -1315,9 +1315,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
		}

		final boolean autoBrightnessAdjustmentChanged = updateAutoBrightnessAdjustment();
		if (autoBrightnessAdjustmentChanged) {
		mTemporaryAutoBrightnessAdjustment = Float.NaN;
		}

		// Use the autobrightness adjustment override if set.
		final float autoBrightnessAdjustment;
		@@ -2293,14 +2290,15 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call

		private void handleSettingsChange(boolean userSwitch) {
		mPendingScreenBrightnessSetting = getScreenBrightnessSetting();
		mPendingAutoBrightnessAdjustment = getAutoBrightnessAdjustmentSetting();
		if (userSwitch) {
		// Don't treat user switches as user initiated change.
		setCurrentScreenBrightness(mPendingScreenBrightnessSetting);
		updateAutoBrightnessAdjustment();
		if (mAutomaticBrightnessController != null) {
		mAutomaticBrightnessController.resetShortTermModel();
		}
		}
		mPendingAutoBrightnessAdjustment = getAutoBrightnessAdjustmentSetting();
		// We don't bother with a pending variable for VR screen brightness since we just
		// immediately adapt to it.
		mScreenBrightnessForVr = getScreenBrightnessForVrSetting();
		@@ -2369,6 +2367,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
		}
		mAutoBrightnessAdjustment = mPendingAutoBrightnessAdjustment;
		mPendingAutoBrightnessAdjustment = Float.NaN;
		mTemporaryAutoBrightnessAdjustment = Float.NaN;
		return true;
		}