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

Commit ab68ace7 authored by Vinit Nayak's avatar Vinit Nayak
Browse files

Avoid continue reparent divider leash after dismiss 

Actually splitscreen is still not stable for entering or closing but handle the recents request with onRecentsInSplitAnimation
but may divider leash already been released and warning in onRecentsInSplitAnimationStart, need add this check in onRecentsInSplitAnimationFinish too.

Bug: 406889299
Test: repeatly splitscreen entering/closing transition and enter recents
Flag: EXEMPT bugfix

Change-Id: I6ef8d11478d69ef0675f9b64064192f520396b7f
parent 0d451afe

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

+6 −1
Original line number Diff line number Diff line
@@ -4283,8 +4283,13 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            }

            updateSurfaceBounds(mSplitLayout, finishT,

                    false /* applyResizingOffset */);

            final SurfaceControl leash = mSplitLayout.getDividerLeash();

            if (leash == null || !leash.isValid()) {

                Slog.w(TAG, "divider leash was released or not be created!");

                return;

            }

            // TODO: b/393217881 - replace DEFAULT DISPLAY with the current display id

            finishT.reparent(mSplitLayout.getDividerLeash(),

            finishT.reparent(leash,

                    mSplitMultiDisplayHelper.getDisplayRootTaskLeash(DEFAULT_DISPLAY));

            setDividerVisibility(true, finishT);

            return;