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

Merge "Dispatch organized tasks info chagne when committing visibility" into sc-v2-dev am: 05b2d626e6 am: 81504bcc8c

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

Change-Id: Ie403cbb164b52cb06d18df059f3492311ae6487c
This commit is contained in:
Jerry Chang
2021-09-28 18:17:35 +00:00
committed by Automerger Merge Worker
parent eefcf058d6 81504bcc8c
commit 2f65063b25
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -4946,11 +4946,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
// dispatchTaskInfoChangedIfNeeded() right after ActivityRecord#setVisibility() can report
// the stale visible state, because the state will be updated after the app transition.
// So tries to report the actual visible state again where the state is changed.
if (!mTaskSupervisor.inActivityVisibilityUpdate()) {
final Task task = getOrganizedTask();
if (task != null) {
task.dispatchTaskInfoChangedIfNeeded(false /* force */);
}
Task task = getOrganizedTask();
while (task != null) {
task.dispatchTaskInfoChangedIfNeeded(false /* force */);
task = task.getParent().asTask();
}
ProtoLog.v(WM_DEBUG_APP_TRANSITIONS,
"commitVisibility: %s: visible=%b mVisibleRequested=%b", this,

4
services/core/java/com/android/server/wm/Task.java
View File

@@ -4809,10 +4809,6 @@ class Task extends TaskFragment {
notifyClients);
}, true /* traverseTopToBottom */);
// Notify WM shell that task visibilities may have changed
forAllTasks(task -> task.dispatchTaskInfoChangedIfNeeded(/* force */ false),
true /* traverseTopToBottom */);
if (mTranslucentActivityWaiting != null &&
mUndrawnActivitiesBelowTopTranslucent.isEmpty()) {
// Nothing is getting drawn or everything was already visible, don't wait for