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

Commit 3a6ec260 authored by Jerry Chang's avatar Jerry Chang
Browse files

Fix drag-to-dismiss split screen crash with shell transition 

There is no need to update split layout after the fling to dismiss split
animation finished. Remove it to prevent conflicting with split
dismissing shell transition.

Fix: 208954095
Bug: 206872147
Test: atest WMShellUnitTests
Test: manual check dismissing split with shell transition won't crash
Change-Id: Ie5faf521fa47e8e534382b6feb63fc27c14627b3
parent 040d9338

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java

+2 −2
Original line number Diff line number Diff line
@@ -335,7 +335,8 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
                        () -> mSplitLayoutHandler.onSnappedToDismiss(true /* bottomOrRight */));

                break;

            default:

                flingDividePosition(currentPosition, snapTarget.position, null);

                flingDividePosition(currentPosition, snapTarget.position,

                        () -> setDividePosition(snapTarget.position));

                break;

        }

    }
@@ -381,7 +382,6 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
        animator.addListener(new AnimatorListenerAdapter() {

            @Override

            public void onAnimationEnd(Animator animation) {

                setDividePosition(to);

                if (flingFinishedCallback != null) {

                    flingFinishedCallback.run();

                }