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

Browse Source
This commit is contained in:
Chris Li
2023-07-18 03:33:31 +00:00
committed by Gerrit Code Review
parent a3cd5a9e90 b33f0178ed
commit 7bb03ce9e5
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;
} }
try {
mTaskSupervisor.beginActivityVisibilityUpdate(); mTaskSupervisor.beginActivityVisibilityUpdate();
try {
// 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);