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

Commit 8213ca13 authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Fix bug on DC#ensureActivitiesVisible" into main am: 7bb03ce9 am:... 

Merge "Fix bug on DC#ensureActivitiesVisible" into main am: 7bb03ce9 am: 8638d385 am: 20e993fe

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2658737



Change-Id: Ia4da51b59b82755ca8e9d302e179d244b9f4ccf9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c7e468a6 20e993fe

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

+1 −1
Original line number Diff line number Diff line
@@ -6401,9 +6401,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
@@ -1847,9 +1847,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);