Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not attach the added recent task to TDA

Browse Source 
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
This commit is contained in:
Louis Chang
2021-01-19 10:02:18 +08:00
parent 0d76523686
commit e2871a4266
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

@@ -2674,8 +2674,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
.setWindowingMode(rootTask.getWindowingMode()) .setWindowingMode(rootTask.getWindowingMode())
.setActivityType(rootTask.getActivityType()) .setActivityType(rootTask.getActivityType())
.setActivityInfo(ainfo) .setActivityInfo(ainfo)
.setParent(rootTask.getDisplayArea())
.setIntent(intent) .setIntent(intent)
.setTaskId(rootTask.getDisplayArea().getNextRootTaskId())
.build(); .build();
if (!mRecentTasks.addToBottom(task)) { if (!mRecentTasks.addToBottom(task)) {

1
services/core/java/com/android/server/wm/Task.java
View File

@@ -7181,6 +7181,7 @@ class Task extends WindowContainer<WindowContainer> {
+ " mode=" + windowingModeToString(getWindowingMode())); + " mode=" + windowingModeToString(getWindowingMode()));
pw.println(" isSleeping=" + shouldSleepActivities()); pw.println(" isSleeping=" + shouldSleepActivities());
pw.println(" mBounds=" + getRequestedOverrideBounds()); pw.println(" mBounds=" + getRequestedOverrideBounds());
pw.println(" mCreatedByOrganizer=" + mCreatedByOrganizer);
}; };
boolean printed = false; boolean printed = false;