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

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

Merge "Only manually show non-reported parents which is also non-organized"... 

Merge "Only manually show non-reported parents which is also non-organized" into main am: d62fa446 am: 247f0878

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



Change-Id: I78af3556c2c1cd582f6f2ffdb90aa46570a30fcc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e932d31a 247f0878

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

+3 −2
Original line number Diff line number Diff line
@@ -1840,7 +1840,8 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
            // already been reset by the original hiding-transition's finishTransaction (we can't

            // show in the finishTransaction because by then the activity doesn't hide until

            // surface placement).

            for (WindowContainer p = ar.getParent(); p != null && !containsChangeFor(p, mTargets);

            for (WindowContainer p = ar.getParent();

                 p != null && !containsChangeFor(p, mTargets) && !p.isOrganized();

                 p = p.getParent()) {

                if (p.getSurfaceControl() != null) {

                    transaction.show(p.getSurfaceControl());