Fix NPE when quick switch on shell transition

Some function call in finishEnterSplitScreen should be non-null so
passing transcation to it instaed of null.

Fix: 223396097
Test: manual
Test: pass existing tests
Change-Id: I0c3e2ab3d04191eabf749bda0f5bb0c11c09723a
This commit is contained in:
Tony Huang
2022-03-09 11:32:55 +08:00
parent abd62d1f0f
commit 710e683523

View File

@@ -1329,8 +1329,11 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
// Once the pending enter transition got merged, make sure to bring divider bar visible and
// clear the pending transition from cache to prevent mess-up the following state.
if (transition == mSplitTransitions.mPendingEnter) {
finishEnterSplitScreen(null);
final SurfaceControl.Transaction t = mTransactionPool.acquire();
finishEnterSplitScreen(t);
mSplitTransitions.mPendingEnter = null;
t.apply();
mTransactionPool.release(t);
}
}