commit b3ad483f45b11a574a124f38c9febd13559e45f5
author Wale Ogunwale <ogunwale@google.com> Wed Oct 21 16:47:18 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 21 16:47:18 2015 +0000
tree 26a566c59dbd40bd1900bbed4f460a301592d8e3
parent d2e6907eaed85d49ec507788a2441e817997c336
parent 8d16a3ddeac89c426c0965d792df63750a35460e

Merge "Ensure state transition of paused activity." am: c2b9c5388a am: 11695e8081
am: 8d16a3ddea

* commit '8d16a3ddeac89c426c0965d792df63750a35460e':
  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 a59f7ef..a67c274 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -993,10 +993,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);
+                    }
                 }
             }
         }