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

Commit c6feebfd authored by Tony Huang's avatar Tony Huang
Browse files

Do not add divider to dismiss transition 

If there is also a display change in same transition, we need to
release old divider surface and it lead to crash due to it running
animation before release.

Actually, we cannot see divider animation in dismiss transition
due to it didn't be added in transition root so its animation
is invisible. So remove this didn't affect current dismiss animation.

Fix: 287207156
Test: manual
Test: pass existing tests
Change-Id: I9c0cacfbd8df7deed5c2b028c1e2af9a0cac540a
parent 149fed16

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+5 −4
Original line number Diff line number Diff line
@@ -2530,8 +2530,11 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            // handling to the mixed-handler to deal with splitting it up.

            if (mMixedHandler.animatePendingSplitWithDisplayChange(transition, info,

                    startTransaction, finishTransaction, finishCallback)) {

                if (mSplitTransitions.isPendingResize(transition)) {

                    // Only need to update in resize because divider exist before transition.

                    mSplitLayout.update(startTransaction);

                    startTransaction.apply();

                }

                return true;

            }

        }
@@ -2888,8 +2891,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            mSideStage.getSplitDecorManager().release(callbackT);

            callbackWct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token, false);

        });



        addDividerBarToTransition(info, false /* show */);

        return true;

    }