From 8bf0aa9b2b1f3d094ca7cc6917afb12cc16085eb Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Tue, 29 Nov 2011 13:54:43 -0800 Subject: Fix issue #5636525: ANR observed in setup wizard after changing language We could sometimes allow a process to be killed while still waiting for an activity in it to finish stopping. Change-Id: Ibf89665c4ad6da6be22de04a82b19ef778a7fda0 --- services/java/com/android/server/am/ActivityManagerService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 15ef056ee255..367844dde026 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -2720,6 +2720,10 @@ public final class ActivityManagerService extends ActivityManagerNative } if (!r.finishing) { Slog.w(TAG, "Force removing " + r + ": app died, no saved state"); + EventLog.writeEvent(EventLogTags.AM_FINISH_ACTIVITY, + System.identityHashCode(r), + r.task.taskId, r.shortComponentName, + "proc died without state saved"); } r.makeFinishing(); mMainStack.mHistory.remove(i); @@ -13596,6 +13600,7 @@ public final class ActivityManagerService extends ActivityManagerNative adj = ProcessList.PERCEPTIBLE_APP_ADJ; app.adjType = "stopping"; } + app.hidden = false; app.foregroundActivities = true; } } -- cgit v1.2.3-59-g8ed1b