From e2871a4266920aec0f189d4b4d1dfd7930218d8d Mon Sep 17 00:00:00 2001 From: Louis Chang Date: Tue, 19 Jan 2021 10:02:18 +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 --- .../java/com/android/server/wm/ActivityTaskManagerService.java | 2 +- services/core/java/com/android/server/wm/Task.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 3c06488e73c3f..b332739820dc5 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -2674,8 +2674,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { .setWindowingMode(rootTask.getWindowingMode()) .setActivityType(rootTask.getActivityType()) .setActivityInfo(ainfo) - .setParent(rootTask.getDisplayArea()) .setIntent(intent) + .setTaskId(rootTask.getDisplayArea().getNextRootTaskId()) .build(); if (!mRecentTasks.addToBottom(task)) { diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index cc982308e658b..1e492df24a62e 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -7181,6 +7181,7 @@ class Task extends WindowContainer { + " mode=" + windowingModeToString(getWindowingMode())); pw.println(" isSleeping=" + shouldSleepActivities()); pw.println(" mBounds=" + getRequestedOverrideBounds()); + pw.println(" mCreatedByOrganizer=" + mCreatedByOrganizer); }; boolean printed = false;