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

Commit c1db8ebb authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Only set valid participant to parent in shell transitions" into tm-dev am: 207a75d8 

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

Change-Id: I0413431ad765b72905dcfeb7c127263edb98ce37
parents 64893da7 207a75d8

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

+11 −12
Original line number Diff line number Diff line
@@ -1135,7 +1135,6 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 
                continue;

            }

            targets.add(wc);

            targets.mValidParticipants.add(wc);

        }

        ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS, "  Initial targets: %s",

                targets.mArray);
@@ -1153,15 +1152,17 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 
    private static void populateParentChanges(Targets targets,

            ArrayMap<WindowContainer, ChangeInfo> changes) {

        final ArrayList<WindowContainer<?>> intermediates = new ArrayList<>();

        for (int i = targets.mValidParticipants.size() - 1; i >= 0; --i) {

            WindowContainer<?> wc = targets.mValidParticipants.get(i);

            // Go up if the participant has been represented by its parent.

            while (targets.mArray.indexOfValue(wc) < 0 && wc.getParent() != null) {

                wc = wc.getParent();

        // Make a copy to iterate because the original array may be modified.

        final ArrayList<WindowContainer<?>> targetList = new ArrayList<>(targets.mArray.size());

        for (int i = targets.mArray.size() - 1; i >= 0; --i) {

            targetList.add(targets.mArray.valueAt(i));

        }

        for (int i = targetList.size() - 1; i >= 0; --i) {

            final WindowContainer<?> wc = targetList.get(i);

            // Wallpaper must belong to the top (regardless of how nested it is in DisplayAreas).

            final boolean skipIntermediateReports = isWallpaper(wc);

            intermediates.clear();

            boolean foundParentInTargets = false;

            // Collect the intermediate parents between target and top changed parent.

            for (WindowContainer<?> p = wc.getParent(); p != null; p = p.getParent()) {

                final ChangeInfo parentChange = changes.get(p);
@@ -1175,19 +1176,19 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 
                    // The chain above the parent was processed.

                    break;

                }

                if (targets.mValidParticipants.contains(p)) {

                if (targetList.contains(p)) {

                    if (skipIntermediateReports) {

                        changes.get(wc).mParent = p;

                    } else {

                        intermediates.add(p);

                    }

                    // The parent reaches a participant.

                    foundParentInTargets = true;

                    break;

                } else if (reportIfNotTop(p) && !skipIntermediateReports) {

                    intermediates.add(p);

                }

            }

            if (intermediates.isEmpty()) continue;

            if (!foundParentInTargets || intermediates.isEmpty()) continue;

            // Add any always-report parents along the way.

            changes.get(wc).mParent = intermediates.get(0);

            for (int j = 0; j < intermediates.size() - 1; j++) {
@@ -1665,8 +1666,6 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 
    private static class Targets {

        /** All targets. Its keys (depth) are sorted in ascending order naturally. */

        final SparseArray<WindowContainer<?>> mArray = new SparseArray<>();

        /** The initial participants which have changes. */

        final ArrayList<WindowContainer<?>> mValidParticipants = new ArrayList<>();

        /** The targets which were represented by their parent. */

        private ArrayList<WindowContainer<?>> mRemovedTargets;

        private int mDepthFactor;