commit 9d958f69939e884450e5bd6588dedb16aefed6e4
author Adam Lesinski <adamlesinski@google.com> Wed Oct 09 17:36:57 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 09 17:36:57 2013 +0000
tree 98953074c8bc8b72935f1d789d53300d33690299
parent e6d419de77344300e342c8a0f6c013afeec87a72
parent aa52437745037b0526d19832191512b63b1ac346

Merge "Allow killed task to remove itself" into klp-dev

services/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 1987d04..564d5e2 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -6755,7 +6755,6 @@
     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);