diff options
author | Dianne Hackborn <hackbod@google.com> | 2011-11-29 13:54:43 -0800 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2011-11-29 13:54:43 -0800 |
commit | 8bf0aa9b2b1f3d094ca7cc6917afb12cc16085eb (patch) | |
tree | 7dabaa7bb4a90849d0c910137431101a37e12a61 | |
parent | 672342c30903fa6b70a3e8e1977bb34210aede14 (diff) | |
download | frameworks_base-8bf0aa9b2b1f3d094ca7cc6917afb12cc16085eb.zip frameworks_base-8bf0aa9b2b1f3d094ca7cc6917afb12cc16085eb.tar.gz frameworks_base-8bf0aa9b2b1f3d094ca7cc6917afb12cc16085eb.tar.bz2 |
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
-rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 15ef056..367844d 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; } } |