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

Commit 3aef1c6d authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE when quick switch on shell transition" into tm-dev am: 607535b8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17129806

Change-Id: I3c5a15cf0bd4e36d7a4f87a040a24ab3334e450f
parents 96be1e46 607535b8

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

+4 −1
Original line number Diff line number Diff line
@@ -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);

        }

    }