From 0bd7ca55eef7649f369303dd5a7c7a4f572ec177 Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Tue, 6 Jun 2023 12:00:37 -0700
Subject: [PATCH] Do not change the leash after completion

Video: http://recall/-/aaaaaabFQoRHlzixHdtY/hDfsnKtrY7i5vJ41crnLhf
Bug: 284738852
Test: manually, follow the reproduce step, see also video
Change-Id: Iad166c1fb7b5db8c6bcd3abf0f3a0189747037da
---
 .../Shell/src/com/android/wm/shell/pip/PipTransition.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java
index f9d615ad0cf6d..5086e2c4b05d0 100644
--- 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