From 8e5b133bf63c0f29ce059bf0ef05695a2f7f99b8 Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Thu, 24 Jul 2014 13:32:37 -0700 Subject: [PATCH] Finish crashed activities immediately By finishing crashed activities right away the VirtualDisplays associated with ActivityView are removed immediately rather than being deferred. Also there is no waiting for Pause (0.5 sec) and Destroy (10 sec) timeouts to expire. Fixes bug 15092354. Change-Id: Ie4941cb19dcc6f6fc61b2475162ea2794c9558a2 --- services/core/java/com/android/server/am/ActivityStack.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 224946ce89c0..95eed1b07531 100755 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -3579,7 +3579,9 @@ final class ActivityStack { if (r.app == app) { Slog.w(TAG, " Force finishing activity " + r.intent.getComponent().flattenToShortString()); - finishActivityLocked(r, Activity.RESULT_CANCELED, null, "crashed", false); + // Force the destroy to skip right to removal. + r.app = null; + finishCurrentActivityLocked(r, FINISH_IMMEDIATELY, false); } } } -- 2.11.0