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

* commit '26b0f1e420c0590ea5e9c506f4f14ba4b0a873f0': Revert "Finish already paused activity if it should be finished after pausing"
2015-07-13 22:29:46 +00:00
parent 459337c8d4 26b0f1e420
commit 6ede9b679e
1 changed files with 0 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -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