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

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

Merge "Mark display ready when it loses active child" into tm-qpr-dev am: d4dc599b 

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



Change-Id: I6a933e4e18211ff05a455f72091a89b064d1bddb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 416d4792 d4dc599b

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

+9 −0
Original line number Diff line number Diff line
@@ -3760,6 +3760,15 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
     * hierarchy change implies a configuration change.

     */

    private void onSyncReparent(WindowContainer oldParent, WindowContainer newParent) {

        // 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())) {

            mTransitionController.setReady(oldParent.getDisplayContent());

        }



        if (newParent == null || newParent.mSyncState == SYNC_STATE_NONE) {

            if (mSyncState == SYNC_STATE_NONE) {

                return;