commit c2b9c5388a4038ba260e2c36b7b8884cf4097c2e
author Wale Ogunwale <ogunwale@google.com> Wed Oct 21 16:03:23 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 21 16:03:23 2015 +0000
tree c8845eb3608156d9b8d6c7678f5372c59325bae8
parent 12dccb8a2450152102b32bf4882200f6b08a5a5a
parent 9caeef72ee19caab9193eb76fc82ff99f7c9534e

Merge "Ensure state transition of paused activity."

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 6e34876..a47e7c6 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -941,10 +941,13 @@
                         r.userId, System.identityHashCode(r), r.shortComponentName,
                         mPausingActivity != null
                             ? mPausingActivity.shortComponentName : "(none)");
-                if (r.finishing && r.state == ActivityState.PAUSING) {
-                    if (DEBUG_PAUSE) Slog.v(TAG,
-                            "Executing finish of failed to pause activity: " + r);
-                    finishCurrentActivityLocked(r, FINISH_AFTER_VISIBLE, false);
+                if (r.state == ActivityState.PAUSING) {
+                    r.state = ActivityState.PAUSED;
+                    if (r.finishing) {
+                        if (DEBUG_PAUSE) Slog.v(TAG,
+                                "Executing finish of failed to pause activity: " + r);
+                        finishCurrentActivityLocked(r, FINISH_AFTER_VISIBLE, false);
+                    }
                 }
             }
         }