diff options
| -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 d9b25adb8c4c..2749b11ce6a1 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -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 // 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()); } |