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

Merge "Only set display ready when transfering displays" into tm-qpr-dev

Browse Source
This commit is contained in:
Evan Rosky
2022-08-01 20:26:11 +00:00
committed by Android (Google) Code Review
parent 7ec075c5a0 4b8cd1d4e8
commit 2d71a01c12
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/WindowContainer.java
View File

@@ -3773,9 +3773,9 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
// Check if this is changing displays. If so, mark the old display as "ready" for // Check if this is changing displays. If so, mark the old display as "ready" for
// transitions. This is to work around the problem where setting readiness against this // transitions. This is to work around the problem where setting readiness against this
// container will only set the new display as ready and leave the old display as unready. // container will only set the new display as ready and leave the old display as unready.
if (mSyncState != SYNC_STATE_NONE && oldParent != null if (mSyncState != SYNC_STATE_NONE && oldParent != null && newParent != null
&& oldParent.getDisplayContent() != null && (newParent == null && oldParent.getDisplayContent() != null && newParent.getDisplayContent() != null
|| oldParent.getDisplayContent() != newParent.getDisplayContent())) { && oldParent.getDisplayContent() != newParent.getDisplayContent()) {
mTransitionController.setReady(oldParent.getDisplayContent()); mTransitionController.setReady(oldParent.getDisplayContent());
} }