summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-11-29 15:28:41 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-29 15:28:41 -0800
commit1808f214b0cd7a62628b273b93a1ea688f262565 (patch)
tree15c136d0ed583cfdcdb103c9522536d8c533d9bc /services
parentd3788b97c9a28e8cbfa4432389a5de04073a333b (diff)
parent8bf0aa9b2b1f3d094ca7cc6917afb12cc16085eb (diff)
downloadframeworks_base-1808f214b0cd7a62628b273b93a1ea688f262565.zip
frameworks_base-1808f214b0cd7a62628b273b93a1ea688f262565.tar.gz
frameworks_base-1808f214b0cd7a62628b273b93a1ea688f262565.tar.bz2
Merge "Fix issue #5636525: ANR observed in setup wizard after changing language" into ics-mr1
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/am/ActivityManagerService.java5
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;
}
}