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

Commit 62d96336 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Do not collect WindowState when moving to a different display" into main

parents bdad7c38 a3a3f0dc

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

+3 −1
Original line number Diff line number Diff line
@@ -1117,7 +1117,9 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
     */

    void onDisplayChanged(DisplayContent dc) {

        if (mDisplayContent != null && mDisplayContent != dc) {

            if (asWindowState() == null) {

                mTransitionController.collect(this);

            }

            // Cancel any change transition queued-up for this container on the old display when

            // this container is moved from the old display.

            mDisplayContent.mClosingChangingContainers.remove(this);