Merge cherrypicks of [2889978, 2889517, 2889500] into oc-m2-release (1c09fda1) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1214,7 +1214,7 @@ 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 (mLastPausedActivity == topActivity()) {
		} 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);