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

Commit a03c5fdd 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: I567a791443080173f40a44d44662902c8611b637
parents 107e1775 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);

        }

    }