Merge "Fix error caused by quick stopDream(false) + startDream() with same dream" into oc-wear-dev (823b0023) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/dreams/DreamManagerService.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -86,6 +86,7 @@ public final class DreamManagerService extends SystemService {
		private boolean mCurrentDreamCanDoze;
		private boolean mCurrentDreamIsDozing;
		private boolean mCurrentDreamIsWaking;
		private Runnable mStopDreamRunnable;
		private int mCurrentDreamDozeScreenState = Display.STATE_UNKNOWN;
		private int mCurrentDreamDozeScreenBrightness = PowerManager.BRIGHTNESS_DEFAULT;

		@@ -354,6 +355,12 @@ public final class DreamManagerService extends SystemService {
		&& mCurrentDreamCanDoze == canDoze
		&& mCurrentDreamUserId == userId) {
		Slog.i(TAG, "Already in target dream.");
		// If dream is waking, cancel the wake.
		mCurrentDreamIsWaking = false;
		if (mStopDreamRunnable != null) {
		mHandler.removeCallbacks(mStopDreamRunnable);
		mStopDreamRunnable = null;
		}
		return;
		}

		@@ -386,13 +393,15 @@ public final class DreamManagerService extends SystemService {
		mCurrentDreamIsWaking = true;
		}

		mHandler.post(new Runnable() {
		mStopDreamRunnable = new Runnable() {
		@Override
		public void run() {
		Slog.i(TAG, "Performing gentle wake from dream.");
		mController.stopDream(immediate);
		mStopDreamRunnable = null;
		}
		});
		};
		mHandler.post(mStopDreamRunnable);
		}
		}