Merge "Don't treat user switch as slider interaction." into pi-dev (d7470751) · Commits · e / os / android_frameworks_base

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

+7 −3

Original line number	Diff line number	Diff line
		@@ -500,7 +500,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
		}

		public void onSwitchUser(@UserIdInt int newUserId) {
		handleSettingsChange();
		handleSettingsChange(true /* userSwitch */);
		mBrightnessTracker.onSwitchUser(newUserId);
		}

		@@ -1420,8 +1420,12 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
		mHandler.post(mOnStateChangedRunnable);
		}

		private void handleSettingsChange() {
		private void handleSettingsChange(boolean userSwitch) {
		mPendingScreenBrightnessSetting = getScreenBrightnessSetting();
		if (userSwitch) {
		// Don't treat user switches as user initiated change.
		mCurrentScreenBrightnessSetting = mPendingScreenBrightnessSetting;
		}
		mPendingAutoBrightnessAdjustment = getAutoBrightnessAdjustmentSetting();
		// We don't bother with a pending variable for VR screen brightness since we just
		// immediately adapt to it.
		@@ -1735,7 +1739,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call

		@Override
		public void onChange(boolean selfChange, Uri uri) {
		handleSettingsChange();
		handleSettingsChange(false /* userSwitch */);
		}
		}