diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2013-10-09 17:36:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-09 17:36:57 +0000 |
| commit | 9d958f69939e884450e5bd6588dedb16aefed6e4 (patch) | |
| tree | 98953074c8bc8b72935f1d789d53300d33690299 /services | |
| parent | e6d419de77344300e342c8a0f6c013afeec87a72 (diff) | |
| parent | aa52437745037b0526d19832191512b63b1ac346 (diff) | |
| download | frameworks_base-9d958f69939e884450e5bd6588dedb16aefed6e4.zip frameworks_base-9d958f69939e884450e5bd6588dedb16aefed6e4.tar.gz frameworks_base-9d958f69939e884450e5bd6588dedb16aefed6e4.tar.bz2 | |
Merge "Allow killed task to remove itself" into klp-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 1 |
1 files changed, 0 insertions, 1 deletions
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 @@ 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); |