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

Commit 58de3715 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixed a bug in logical operations in Transition#addOnTopTasks" into main

parents 387e95c9 f04769b1

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -883,13 +883,13 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
        recordDisplay(from.getDisplayContent());

        recordDisplay(from.getDisplayContent());

    }

    }





    /** Adds the top non-alwaysOnTop tasks within `task` to `out`. */

    /** Adds the top visible non-alwaysOnTop tasks within `task` to `out`. */

    private static void addOnTopTasks(Task task, ArrayList<Task> out) {

    private static void addOnTopTasks(Task task, ArrayList<Task> out) {

        for (int i = task.getChildCount() - 1; i >= 0; --i) {

        for (int i = task.getChildCount() - 1; i >= 0; --i) {

            final Task child = task.getChildAt(i).asTask();

            final Task child = task.getChildAt(i).asTask();

            if (child == null) return;

            if (child == null) return;

            if (child.getWindowConfiguration().isAlwaysOnTop()

            if (child.getWindowConfiguration().isAlwaysOnTop()

                    && (!com.android.window.flags.Flags.polishCloseWallpaperIncludesOpenChange()

                    || (!com.android.window.flags.Flags.polishCloseWallpaperIncludesOpenChange()

                        || !child.isVisibleRequested())) {

                        || !child.isVisibleRequested())) {

                continue;

                continue;

            }

            }