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

Commit c54622c4 authored by Evan Rosky's avatar Evan Rosky
Browse files

Clean-up split pendingremote when merged 

Otherwise, following transitions mistakenly use the remote
which can cause it to get into a broken state.

Bug: 228883780
Test: go into split, quickswitch, quickswitch back, drag-divider
      to dismiss.
Change-Id: Ic2740cca08e3539247f0703d693b252b7e18406d
parent 7d280545

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

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ class SplitScreenTransitions { 
    IBinder mPendingRecent = null;



    private IBinder mAnimatingTransition = null;

    private OneShotRemoteHandler mPendingRemoteHandler = null;

    OneShotRemoteHandler mPendingRemoteHandler = null;

    private OneShotRemoteHandler mActiveRemoteHandler = null;



    private final Transitions.TransitionFinishCallback mRemoteFinishCB = this::onFinish;

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

+1 −0
Original line number Diff line number Diff line
@@ -1432,6 +1432,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            final SurfaceControl.Transaction t = mTransactionPool.acquire();

            finishEnterSplitScreen(t);

            mSplitTransitions.mPendingEnter = null;

            mSplitTransitions.mPendingRemoteHandler = null;

            t.apply();

            mTransactionPool.release(t);

        }