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

Commit ebf91d3e authored by Issei Suzuki's avatar Issei Suzuki Committed by Automerger Merge Worker
Browse files

Merge "Fix WM shell crash when targets belong to a different display." into... 

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

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



Change-Id: Ia875ad141f72564f015e12e601a657030aa4d84a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 40320efb d002c621

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

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

        }