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

2015-07-10 22:53:11 +00:00
parent 8657d9e8a5 12bb956828
commit 26b0f1e420
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