Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I82dd7bd706680ac074c642dc7336719d566a5461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chris Li
2023-07-18 04:10:34 +00:00
committed by Automerger Merge Worker
parent 35ed783c43 7bb03ce9e5
commit 8638d38518
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -6302,9 +6302,9 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
// Don't do recursive work. // Don't do recursive work.
return; return;
} }
mInEnsureActivitiesVisible = true;
mAtmService.mTaskSupervisor.beginActivityVisibilityUpdate(); mAtmService.mTaskSupervisor.beginActivityVisibilityUpdate();
try { try {
mInEnsureActivitiesVisible = true;
forAllRootTasks(rootTask -> { forAllRootTasks(rootTask -> {
rootTask.ensureActivitiesVisible(starting, configChanges, preserveWindows, rootTask.ensureActivitiesVisible(starting, configChanges, preserveWindows,
notifyClients); notifyClients);

3
services/core/java/com/android/server/wm/RootWindowContainer.java
View File

@@ -1833,9 +1833,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
// Don't do recursive work. // Don't do recursive work.
return; return;
} }
mTaskSupervisor.beginActivityVisibilityUpdate();
try { try {
mTaskSupervisor.beginActivityVisibilityUpdate();
// First the front root tasks. In case any are not fullscreen and are in front of home. // 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) { for (int displayNdx = getChildCount() - 1; displayNdx >= 0; --displayNdx) {
final DisplayContent display = getChildAt(displayNdx); final DisplayContent display = getChildAt(displayNdx);