fixup! AutoBrightness: Add support for one shot auto-brightness (74ea8c5a) · Commits · e / os / android_frameworks_base

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -95,6 +95,8 @@ import com.android.server.display.whitebalance.DisplayWhiteBalanceFactory;
		import com.android.server.display.whitebalance.DisplayWhiteBalanceSettings;
		import com.android.server.policy.WindowManagerPolicy;

		import lineageos.providers.LineageSettings;

		import java.io.PrintWriter;
		import java.util.Objects;

		@@ -995,6 +997,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
		Settings.System.getUriFor(Settings.System.SCREEN_BRIGHTNESS_FOR_ALS),
		/* notifyForDescendants= */ false, mSettingsObserver, UserHandle.USER_CURRENT);
		}
		mContext.getContentResolver().registerContentObserver(
		LineageSettings.System.getUriFor(LineageSettings.System.AUTO_BRIGHTNESS_ONE_SHOT),
		false /notifyForDescendants/, mSettingsObserver, UserHandle.USER_ALL);
		handleBrightnessModeChange();
		}

		@@ -2419,6 +2424,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
		.setPendingScreenBrightness(mDisplayBrightnessController
		.getScreenBrightnessSetting());
		mAutomaticBrightnessStrategy.updatePendingAutoBrightnessAdjustments();
		mAutomaticBrightnessStrategy.setAutoBrightnessOneShotEnabled(
		getAutoBrightnessOneShotSetting());
		sendUpdatePowerState();
		}

		@@ -2431,6 +2438,11 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
		== Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
		}

		private boolean getAutoBrightnessOneShotSetting() {
		return LineageSettings.System.getIntForUser(
		mContext.getContentResolver(), LineageSettings.System.AUTO_BRIGHTNESS_ONE_SHOT,
		0, UserHandle.USER_CURRENT) == 1;
		}

		@Override
		public float getScreenBrightnessSetting() {