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

2015-07-08 23:34:29 +00:00
parent 9f4c4ee666 bef8a3e393
commit dad62b9f99
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -2963,6 +2963,7 @@ 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