Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean-up split pendingremote when merged

Browse Source 
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
This commit is contained in:
Evan Rosky
2022-04-14 19:59:50 -07:00
parent 7d28054574
commit c54622c406
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;

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

@@ -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);
}