commit 26b0f1e420c0590ea5e9c506f4f14ba4b0a873f0
author Wale Ogunwale <ogunwale@google.com> Fri Jul 10 22:53:11 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 10 22:53:14 2015 +0000
tree 6b617ba81a1dde0ec1ef17d1ae5e41ca6b219266
parent 8657d9e8a56af7847578b65a881016da985b3531
parent 12bb956828d2df983baa0dad2523ab19b1a4577b

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

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

diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 31cdcd5..8c3a950 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -2963,7 +2963,6 @@
         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