Merge cherrypicks of [2887209, 2884958] into oc-mr1-release (df940f3f) · Commits · e / os / android_frameworks_base

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -1214,6 +1214,11 @@ 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) {
		// Our top activity is currently paused, we need to ensure we move it to the stopped
		// state.
		stopActivityLocked(mLastPausedActivity);
		shouldSleep = false;
		}

		if (!shuttingDown) {