drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue #5636525: ANR observed in setup wizard after changing language" into ics-mr1

Browse Source
This commit is contained in:
Dianne Hackborn
2011-11-29 15:28:41 -08:00
committed by Android (Google) Code Review
parent d3788b97c9 8bf0aa9b2b
commit 1808f214b0
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/java/com/android/server/am/ActivityManagerService.java
View File

@ -2720,6 +2720,10 @@ public final class ActivityManagerService extends ActivityManagerNative
} }
if (!r.finishing) { if (!r.finishing) {
Slog.w(TAG, "Force removing " + r + ": app died, no saved state"); 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(); r.makeFinishing();
mMainStack.mHistory.remove(i); mMainStack.mHistory.remove(i);
@ -13596,6 +13600,7 @@ public final class ActivityManagerService extends ActivityManagerNative
adj = ProcessList.PERCEPTIBLE_APP_ADJ; adj = ProcessList.PERCEPTIBLE_APP_ADJ;
app.adjType = "stopping"; app.adjType = "stopping";
} }
app.hidden = false;
app.foregroundActivities = true; app.foregroundActivities = true;
} }
} }