am 92fba41f: am 9d958f69: Merge "Allow killed task to remove itself" into klp-dev

* commit '92fba41f3c64407f6827399bfa40bbcf6eac9212':
  Allow killed task to remove itself
This commit is contained in:
Adam Lesinski
2013-10-09 10:48:47 -07:00
committed by Android Git Automerger

View File

@@ -6755,7 +6755,6 @@ public final class ActivityManagerService extends ActivityManagerNative
private void cleanUpRemovedTaskLocked(TaskRecord tr, int flags) {
tr.disposeThumbnail();
mRecentTasks.remove(tr);
mStackSupervisor.removeTask(tr);
final boolean killProcesses = (flags&ActivityManager.REMOVE_TASK_KILL_PROCESS) != 0;
Intent baseIntent = new Intent(
tr.intent != null ? tr.intent : tr.affinityIntent);