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 am: 2d71a01c12 am: 376a540f9b

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

Change-Id: I2815cb1eb4c936ba6279e0b36b0d0146d9ae6fe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Evan Rosky
2022-08-01 21:08:09 +00:00
committed by Automerger Merge Worker
parent 5051114b9a 376a540f9b
commit 0de48bf2f8
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

@@ -3769,9 +3769,9 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
// 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
// container will only set the new display as ready and leave the old display as unready.
if (mSyncState != SYNC_STATE_NONE && oldParent != null
&& oldParent.getDisplayContent() != null && (newParent == null
|| oldParent.getDisplayContent() != newParent.getDisplayContent())) {
if (mSyncState != SYNC_STATE_NONE && oldParent != null && newParent != null
&& oldParent.getDisplayContent() != null && newParent.getDisplayContent() != null
&& oldParent.getDisplayContent() != newParent.getDisplayContent()) {
mTransitionController.setReady(oldParent.getDisplayContent());
}