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

Commit d002c621 authored by Issei Suzuki's avatar Issei Suzuki Committed by Android (Google) Code Review
Browse files

Merge "Fix WM shell crash when targets belong to a different display." into tm-qpr-dev

parents 67c61bf5 cd8958e6
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -1645,8 +1645,11 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {

        WindowContainer<?> ancestor = findCommonAncestor(sortedTargets, changes, topApp);

        // make leash based on highest (z-order) direct child of ancestor with a participant.
        WindowContainer leashReference = sortedTargets.get(0);
        // Make leash based on highest (z-order) direct child of ancestor with a participant.
        // TODO(b/261418859): Handle the case when the target contains window containers which
        // belong to a different display. As a workaround we use topApp, from which wallpaper
        // window container is removed, instead of sortedTargets here.
        WindowContainer leashReference = topApp;
        while (leashReference.getParent() != ancestor) {
            leashReference = leashReference.getParent();
        }