diff --git a/services/core/java/com/android/server/wm/TaskDisplayArea.java b/services/core/java/com/android/server/wm/TaskDisplayArea.java index dfb559f93ca34..21608ed4f573d 100644 --- a/services/core/java/com/android/server/wm/TaskDisplayArea.java +++ b/services/core/java/com/android/server/wm/TaskDisplayArea.java @@ -18,7 +18,6 @@ package com.android.server.wm; import static android.app.ActivityTaskManager.INVALID_TASK_ID; import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; -import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS; import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; @@ -116,9 +115,6 @@ final class TaskDisplayArea extends DisplayArea { private Task mRootPinnedTask; private Task mRootSplitScreenPrimaryTask; - // TODO(b/159029784): Remove when getStack() behavior is cleaned-up - private Task mRootRecentsTask; - private final ArrayList mTmpAlwaysOnTopChildren = new ArrayList<>(); private final ArrayList mTmpNormalChildren = new ArrayList<>(); private final ArrayList mTmpHomeChildren = new ArrayList<>(); @@ -227,8 +223,6 @@ final class TaskDisplayArea extends DisplayArea { Task getRootTask(int windowingMode, int activityType) { if (activityType == ACTIVITY_TYPE_HOME) { return mRootHomeTask; - } else if (activityType == ACTIVITY_TYPE_RECENTS) { - return mRootRecentsTask; } if (windowingMode == WINDOWING_MODE_PINNED) { return mRootPinnedTask; @@ -256,11 +250,6 @@ final class TaskDisplayArea extends DisplayArea { return mRootHomeTask; } - @Nullable - Task getRootRecentsTask() { - return mRootRecentsTask; - } - Task getRootPinnedTask() { return mRootPinnedTask; } @@ -310,16 +299,6 @@ final class TaskDisplayArea extends DisplayArea { } else { mRootHomeTask = rootTask; } - } else if (rootTask.isActivityTypeRecents()) { - if (mRootRecentsTask != null) { - if (!rootTask.isDescendantOf(mRootRecentsTask)) { - throw new IllegalArgumentException("addRootTaskReferenceIfNeeded: root recents" - + " task=" + mRootRecentsTask + " already exist on display=" + this - + " rootTask=" + rootTask); - } - } else { - mRootRecentsTask = rootTask; - } } if (!rootTask.isRootTask()) { @@ -347,8 +326,6 @@ final class TaskDisplayArea extends DisplayArea { void removeRootTaskReferenceIfNeeded(Task rootTask) { if (rootTask == mRootHomeTask) { mRootHomeTask = null; - } else if (rootTask == mRootRecentsTask) { - mRootRecentsTask = null; } else if (rootTask == mRootPinnedTask) { mRootPinnedTask = null; } else if (rootTask == mRootSplitScreenPrimaryTask) {