Merge "Prevent dream service finishSelf before it was attached" into rvc-dev (22404310) · Commits · e / os / android_frameworks_base

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

+17 −12

Original line number	Diff line number	Diff line
		@@ -904,15 +904,21 @@ public class DreamService extends Service implements Window.Callback {
		if (!mActivity.isFinishing()) {
		// In case the activity is not finished yet, do it now.
		mActivity.finishAndRemoveTask();
		return;
		}
		} else if (!mWindowless) {
		Slog.w(TAG, "Finish was called before the dream was attached.");
		return;
		}

		if (!mFinished) {
		if (mFinished) {
		return;
		}
		mFinished = true;

		if (mDreamToken == null) {
		Slog.w(TAG, "Finish was called before the dream was attached.");
		stopSelf();
		return;
		}

		try {
		// finishSelf will unbind the dream controller from the dream service. This will
		// trigger DreamService.this.onDestroy and DreamService.this will die.
		@@ -921,7 +927,6 @@ public class DreamService extends Service implements Window.Callback {
		// system server died
		}
		}
		}

		/**
		* Wakes the dream up gently.