Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 376a540f authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Only set display ready when transfering displays" into tm-qpr-dev am: 2d71a01c 

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



Change-Id: Ic19cb05e1947bbaf961e6c1b5a97294daf0db536
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a8dd816a 2d71a01c

services/core/java/com/android/server/wm/WindowContainer.java

+3 −3
Original line number Diff line number Diff line
@@ -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());

        }