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

Commit 2379f390 authored by Winson Chung's avatar Winson Chung
Browse files

Only cancel pending resize transition if it still exists 

- Canceling the running animation can reset the pending resize which can
  lead to a NPE when trying to cancel it directly

Flag: EXEMPT bugfix
Fixes: 340380540
Test: NPE fix
Change-Id: I2b8037fc81c55aad3a080802cf4cbb89d56c47e6
parent 060e8c4b

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

+1 −1
Original line number Diff line number Diff line
@@ -417,9 +417,9 @@ class SplitScreenTransitions { 
        ProtoLog.d(WM_SHELL_SPLIT_SCREEN, "setResizeTransition: hasPendingResize=%b",

                mPendingResize != null);

        if (mPendingResize != null) {

            mPendingResize.cancel(null);

            mainDecor.cancelRunningAnimations();

            sideDecor.cancelRunningAnimations();

            mPendingResize.cancel(null);

            mAnimations.clear();

            onFinish(null /* wct */);

        }