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

Commit 7bb03ce9 authored by Chris Li's avatar Chris Li Committed by Gerrit Code Review
Browse files

Merge "Fix bug on DC#ensureActivitiesVisible" into main

parents a3cd5a9e b33f0178

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

+1 −1
Original line number Diff line number Diff line
@@ -6302,9 +6302,9 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
            // Don't do recursive work.

            return;

        }

        mInEnsureActivitiesVisible = true;

        mAtmService.mTaskSupervisor.beginActivityVisibilityUpdate();

        try {

            mInEnsureActivitiesVisible = true;

            forAllRootTasks(rootTask -> {

                rootTask.ensureActivitiesVisible(starting, configChanges, preserveWindows,

                        notifyClients);

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

+1 −2
Original line number Diff line number Diff line
@@ -1833,9 +1833,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
            // Don't do recursive work.

            return;

        }



        try {

        mTaskSupervisor.beginActivityVisibilityUpdate();

        try {

            // First the front root tasks. In case any are not fullscreen and are in front of home.

            for (int displayNdx = getChildCount() - 1; displayNdx >= 0; --displayNdx) {

                final DisplayContent display = getChildAt(displayNdx);