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

Commit 4b8cd1d4 authored by Evan Rosky's avatar Evan Rosky
Browse files

Only set display ready when transfering displays 

Was doing it when removing window, but that case should be handled
already by the transition already. Here it triggers too easily
causing premature readiness

Bug: 238328090
Test: atest CtsTextTestCases
Change-Id: Ie3b4def4940125fcc31d8a7d5583acbe799f5f29
parent a6e81f57

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());

        }