Merge "Revert "Make sure top activity is stopped on sleep if paused."" into oc-mr1-dev (8dd7d067) · Commits · e / os / android_frameworks_base

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

+0 −5

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

		if (!shuttingDown) {