From 14cfbb4923bf1eb82fc8642bbb76198661d9ab61 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Fri, 20 Oct 2017 13:54:39 -0700 Subject: [PATCH] Temporarily disable active task trimming. Bug: 68045330 Bug: 34270611 Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java Change-Id: I8c70d4f97867aca158de158d32be4b5fda1b3479 --- .../com/android/server/am/ActivityStackSupervisor.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 5c91e3ccd0507..c7acbfa3f832c 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -3002,12 +3002,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D @Override public void onRecentTaskRemoved(TaskRecord task, boolean wasTrimmed) { - if (wasTrimmed) { - // Task was trimmed from the recent tasks list -- remove the active task record as well - // since the user won't really be able to go back to it - removeTaskByIdLocked(task.taskId, false /* killProcess */, - false /* removeFromRecents */); - } + // TODO: Trim active task once b/68045330 is fixed task.removedFromRecents(); }