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

Commit ff29ab29 authored by Gaurav Bhola's avatar Gaurav Bhola Committed by Android (Google) Code Review
Browse files

Merge "Localize the removal of root tasks to default TDA in tests" into main

parents 13b4b9c1 095cde3c

core/java/android/app/ActivityTaskManager.java

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ public class ActivityTaskManager { 
        }

    }



    /** Removes root tasks of the activity types from the system. */

    /** Removes root tasks of the activity types from the Default TDA of all displays. */

    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS)

    public void removeRootTasksWithActivityTypes(@NonNull int[] activityTypes) {

        try {

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

+1 −1
Original line number Diff line number Diff line
@@ -6266,7 +6266,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        // by looping the children, so that we don't miss any root tasks after the children size

        // changed or reordered.

        final ArrayList<Task> rootTasks = new ArrayList<>();

        forAllRootTasks(rootTask -> {

        getDefaultTaskDisplayArea().forAllRootTasks(rootTask -> {

            for (int activityType : activityTypes) {

                // Collect the root tasks that are currently being organized.

                if (rootTask.mCreatedByOrganizer) {