Merge cherrypicks of [2891132] into oc-mr1-release (a0acfc25) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityStack.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -1190,6 +1190,7 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
		* process of going to sleep (checkReadyForSleep will be called when that process finishes).
		*/
		boolean goToSleepIfPossible(boolean shuttingDown) {
		final ActivityRecord topActivity = topActivity();
		boolean shouldSleep = true;

		if (mResumedActivity != null) {
		@@ -1214,10 +1215,10 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
		// Still waiting for something to pause; can't sleep yet.
		if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Sleep still waiting to pause " + mPausingActivity);
		shouldSleep = false;
		} else if (topActivity() != null && topActivity().state == ActivityState.PAUSED) {
		} else if (topActivity != null && topActivity.state == ActivityState.PAUSED) {
		// Our top activity is currently paused, we need to ensure we move it to the stopped
		// state.
		stopActivityLocked(mLastPausedActivity);
		stopActivityLocked(topActivity);
		shouldSleep = false;
		}