Merge "Do not change the leash after completion" into udc-dev

2023-06-06 21:35:21 +00:00
parent 3ed995b32d 0bd7ca55ee
commit 264de2e91a
1 changed files with 3 additions and 2 deletions
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java
@@ -308,8 +308,9 @@ public class PipTransition extends PipTransitionController {
    @Override
    public void end() {
        Animator animator = mPipAnimationController.getCurrentAnimator();
-        if (animator == null) return;
-        animator.end();
+        if (animator != null && animator.isRunning()) {
+            animator.end();
+        }
    }

    @Override