diff options
| author | 2022-08-01 21:08:09 +0000 | |
|---|---|---|
| committer | 2022-08-01 21:08:09 +0000 | |
| commit | 0de48bf2f88e809d8719572f0d312f6d8ccf8545 (patch) | |
| tree | cfd6125238f6e01af12a900bb3958da3d2791523 | |
| parent | 5051114b9a6090033bebc4aa9cac9e1c1ef42302 (diff) | |
| parent | 376a540f9b31a9acbba8188d6444e6f66eae2b5c (diff) | |
Merge "Only set display ready when transfering displays" into tm-qpr-dev am: 2d71a01c12 am: 376a540f9b
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>
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowContainer.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index bce131b6700b..adb8bf696dd3 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -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()); } |