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

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

Merge "Fix MixedDeviceOwnerTest test failure" into 24D1-dev

parents e77705d2 82ab73b4

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

+5 −0
Original line number Diff line number Diff line
@@ -1258,6 +1258,11 @@ class RecentTasks { 
                continue;

            }



            if (otherTask.topRunningActivity() == null) {

                // Skip if there's no running activity in the Task.

                continue;

            }



            // Stop searching if the task has higher z-ordering, or increase the index and

            // continue the search.

            if (task.compareTo(otherTask) > 0) {

services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java

+4 −2
Original line number Diff line number Diff line
@@ -1210,9 +1210,11 @@ public class RecentTasksTest extends WindowTestsBase { 
    @Test

    public void addTask_tasksAreAddedAccordingToZOrder() {

        final Task firstTask = new TaskBuilder(mSupervisor).setTaskId(1)

                .setWindowingMode(WINDOWING_MODE_FREEFORM).build();

                .setWindowingMode(WINDOWING_MODE_FREEFORM)

                .setCreateActivity(true).build();

        final Task secondTask = new TaskBuilder(mSupervisor).setTaskId(2)

                .setWindowingMode(WINDOWING_MODE_FREEFORM).build();

                .setWindowingMode(WINDOWING_MODE_FREEFORM)

                .setCreateActivity(true).build();



        assertEquals(-1, firstTask.compareTo(secondTask));