From eea325b46fb1a375878a0b234619120c2e8ddbef Mon Sep 17 00:00:00 2001 From: Louis Chang Date: Wed, 20 Jan 2021 11:04:21 +0800 Subject: [PATCH] Do not attach the added recent task to TDA An empty task was attached to a TaskDisplayArea during ActivityManager#addAppTask() and the empty task was detected by tests as a leaked task. Bug: 177475203 Test: run sample program to invoke ActivityManager#addAppTask() Change-Id: Ibe09d7f0381705defe2fc82bf11339da2aaa6294 Merged-In: Ibe09d7f0381705defe2fc82bf11339da2aaa6294 --- .../com/android/server/wm/ActivityTaskManagerService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 0542ef9b09a40..783037f6f1717 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -3306,9 +3306,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { } final ActivityStack stack = r.getRootTask(); - final Task task = stack.getDisplayArea().createStack(stack.getWindowingMode(), - stack.getActivityType(), !ON_TOP, ainfo, intent, - false /* createdByOrganizer */); + final Task task = new ActivityStack(this, stack.getDisplayArea().getNextStackId(), + stack.getActivityType(), ainfo, intent, false /* createdByOrganizer */); if (!mRecentTasks.addToBottom(task)) { // The app has too many tasks already and we can't add any more