Commit d91f9c7e authored Jul 13, 2015 by Wale Ogunwale Committed by Android Git Automerger Jul 13, 2015

am 6ede9b67: am 26b0f1e4: Merge "Revert "Finish already paused activity if it...

am 6ede9b67: am 26b0f1e4: Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev

* commit '6ede9b67':
  Revert "Finish already paused activity if it should be finished after pausing"

parents 78c93dfc 6ede9b67

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -2963,7 +2963,6 @@ final class ActivityStack {
		r.state = ActivityState.FINISHING;

		if (mode == FINISH_IMMEDIATELY
		\|\| (mode == FINISH_AFTER_PAUSE && prevState == ActivityState.PAUSED)
		\|\| prevState == ActivityState.STOPPED
		\|\| prevState == ActivityState.INITIALIZING) {
		// If this activity is already stopped, we can just finish