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

Commit 4419bc6c authored by Evan Rosky's avatar Evan Rosky
Browse files

Update layers on all participating displays vs just targets 

In heavy multi-window scenarios, its possible for task order
to change among tasks without being "animatable" (eg. tasks
that are not on top changing order). In this case, even if
the transition itself is a no-op (no animatable changes),
the surface order still needs to be recalculated since it was
paused during the collection phase.

Bug: 361501847
Test: make a WCT which results in the order between non-top
      tasks changing. Ensure that the resulting surface order
      matches
Flag: EXEMPT bugfix
Change-Id: If7f48c523ea500664bdfb42714d6ec5184759e01
parent 4686eea0

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

+9 −8
Original line number Diff line number Diff line
@@ -1057,9 +1057,8 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
     * needs to be passed/applied in shell because until finish is called, shell owns the surfaces.

     * Additionally, this gives shell the ability to better deal with merged transitions.

     */

    private void buildFinishTransaction(SurfaceControl.Transaction t, TransitionInfo info) {

        // usually only size 1

        final ArraySet<DisplayContent> displays = new ArraySet<>();

    private void buildFinishTransaction(SurfaceControl.Transaction t, TransitionInfo info,

            DisplayContent[] participantDisplays) {

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

            final WindowContainer<?> target = mTargets.get(i).mContainer;

            if (target.getParent() == null) continue;
@@ -1071,7 +1070,6 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
            t.setCornerRadius(targetLeash, 0);

            t.setShadowRadius(targetLeash, 0);

            t.setAlpha(targetLeash, 1);

            displays.add(target.getDisplayContent());

            // For config-at-end, the end-transform will be reset after the config is actually

            // applied in the client (since the transform depends on config). The other properties

            // remain here because shell might want to persistently override them.
@@ -1085,9 +1083,8 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
        }

        // Need to update layers on involved displays since they were all paused while

        // the animation played. This puts the layers back into the correct order.

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

            if (displays.valueAt(i) == null) continue;

            assignLayers(displays.valueAt(i), t);

        for (int i = participantDisplays.length - 1; i >= 0; --i) {

            assignLayers(participantDisplays[i], t);

        }



        for (int i = 0; i < info.getRootCount(); ++i) {
@@ -1800,6 +1797,8 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
        mController.moveToPlaying(this);



        // Repopulate the displays based on the resolved targets.

        final DisplayContent[] participantDisplays = mTargetDisplays.toArray(

                new DisplayContent[mTargetDisplays.size()]);

        mTargetDisplays.clear();

        for (int i = 0; i < info.getRootCount(); ++i) {

            final DisplayContent dc = mController.mAtm.mRootWindowContainer.getDisplayContent(
@@ -1893,7 +1892,9 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
                controller.setupStartTransaction(transaction);

            }

        }

        buildFinishTransaction(mFinishTransaction, info);

        // Use participant displays here (rather than just targets) because it's possible for

        // there to be order changes between non-top tasks in an otherwise no-op transition.

        buildFinishTransaction(mFinishTransaction, info, participantDisplays);

        mCleanupTransaction = mController.mAtm.mWindowManager.mTransactionFactory.get();

        buildCleanupTransaction(mCleanupTransaction, info);

        if (mController.getTransitionPlayer() != null && mIsPlayerEnabled) {