Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a2338cc authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Ensure the bubble task is a root task" into main

parents 64963758 f1b81c5d

services/core/java/com/android/server/wm/TaskDisplayArea.java

+5 −1
Original line number Diff line number Diff line
@@ -804,7 +804,11 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { 
            final Task launchParentTask = getLaunchRootTask(resolvedWindowingMode, activityType,

                    options, sourceTask, launchFlags, candidateTask);

            final boolean reparentToTda = (options != null && options.getReparentLeafTaskToTda())

                    || candidateTask.getRootTask().mReparentLeafTaskIfRelaunch;

                    || candidateTask.getRootTask().mReparentLeafTaskIfRelaunch

                    // TODO(b/407669465): remove it once migrated to the new approach

                    // Before using a root task to manage the bubble tasks, the launching bubble

                    // task should be re-parented to TDA.

                    || (sourceTask != null && sourceTask.mLaunchNextToBubble);

            if (launchParentTask != null) {

                if (candidateTask.getParent() == null) {

                    launchParentTask.addChild(candidateTask, position);