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

Commit 573d9a4e authored by Mateusz Cicheński's avatar Mateusz Cicheński Committed by Android (Google) Code Review
Browse files

Merge "Fix a stale animator reference being used on bounds change" into udc-dev

parents d0316dc1 79885f4c

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipAnimationController.java

+5 −0
Original line number Diff line number Diff line
@@ -188,6 +188,11 @@ public class PipAnimationController { 
        return mCurrentAnimator;

    }



    /** Reset animator state to prevent it from being used after its lifetime. */

    public void resetAnimatorState() {

        mCurrentAnimator = null;

    }



    private PipTransitionAnimator setupPipTransitionAnimator(PipTransitionAnimator animator) {

        animator.setSurfaceTransactionHelper(mSurfaceTransactionHelper);

        animator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java

+1 −0
Original line number Diff line number Diff line
@@ -1854,6 +1854,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
                        animator::clearContentOverlay);

            }

            PipAnimationController.quietCancel(animator);

            mPipAnimationController.resetAnimatorState();

        }

    }