Merge "[ActivityManager] Finish the failed-to-pause activity"

2015-04-08 12:51:11 +00:00
parent 80e455e325 047dfd40fd
commit 1bdbce295c
1 changed files with 5 additions and 0 deletions
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@ -899,6 +899,11 @@ final class ActivityStack {
                        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);
+                }
            }
        }
    }