Merge cherrypicks of ['googleplex-android-review.googlesource.com/28798849'] into 24Q3-release. (6881fb10) · Commits · e / os / android_frameworks_base

core/java/android/service/dreams/DreamService.java

+22 −14

Original line number	Diff line number	Diff line
		@@ -262,9 +262,9 @@ public class DreamService extends Service implements Window.Callback {
		private boolean mDozing;
		private boolean mWindowless;
		private boolean mPreviewMode;
		private volatile int mDozeScreenState = Display.STATE_UNKNOWN;
		private volatile @Display.StateReason int mDozeScreenStateReason = Display.STATE_REASON_UNKNOWN;
		private volatile int mDozeScreenBrightness = PowerManager.BRIGHTNESS_DEFAULT;
		private int mDozeScreenState = Display.STATE_UNKNOWN;
		private @Display.StateReason int mDozeScreenStateReason = Display.STATE_REASON_UNKNOWN;
		private int mDozeScreenBrightness = PowerManager.BRIGHTNESS_DEFAULT;

		private boolean mDebug = false;

		@@ -906,13 +906,15 @@ public class DreamService extends Service implements Window.Callback {
		*/
		@UnsupportedAppUsage
		public void startDozing() {
		synchronized (this) {
		if (mCanDoze && !mDozing) {
		mDozing = true;
		updateDoze();
		}
		}
		}

		private void updateDoze() {
		private synchronized void updateDoze() {
		if (mDreamToken == null) {
		Slog.w(mTag, "Updating doze without a dream token.");
		return;
		@@ -920,6 +922,8 @@ public class DreamService extends Service implements Window.Callback {

		if (mDozing) {
		try {
		Slog.v(mTag, "UpdateDoze mDozeScreenState=" + mDozeScreenState
		+ " mDozeScreenBrightness=" + mDozeScreenBrightness);
		mDreamManager.startDozing(
		mDreamToken, mDozeScreenState, mDozeScreenStateReason,
		mDozeScreenBrightness);
		@@ -1034,12 +1038,14 @@ public class DreamService extends Service implements Window.Callback {
		*/
		@UnsupportedAppUsage
		public void setDozeScreenState(int state, @Display.StateReason int reason) {
		synchronized (this) {
		if (mDozeScreenState != state) {
		mDozeScreenState = state;
		mDozeScreenStateReason = reason;
		updateDoze();
		}
		}
		}

		/**
		* Gets the screen brightness to use while dozing.
		@@ -1089,11 +1095,13 @@ public class DreamService extends Service implements Window.Callback {
		if (brightness != PowerManager.BRIGHTNESS_DEFAULT) {
		brightness = clampAbsoluteBrightness(brightness);
		}
		synchronized (this) {
		if (mDozeScreenBrightness != brightness) {
		mDozeScreenBrightness = brightness;
		updateDoze();
		}
		}
		}

		/**
		* Called when this Dream is constructed.