| commit | 264de2e91ada7dbcc836695b7586fdb384133592 | [log] [tgz] |
|---|---|---|
| author | Hongwei Wang <hwwang@google.com> | Tue Jun 06 21:35:21 2023 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 06 21:35:21 2023 +0000 |
| tree | 66e913e57ec6edd4a25f47a2a824a9febe5310e7 | |
| parent | 3ed995b32dfe844a8c30d7965c03a7a0f4db1bd4 [diff] | |
| parent | 0bd7ca55eef7649f369303dd5a7c7a4f572ec177 [diff] |
Merge "Do not change the leash after completion" into udc-dev
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 f9d615a..5086e2c 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 @@ @Override public void end() { Animator animator = mPipAnimationController.getCurrentAnimator(); - if (animator == null) return; - animator.end(); + if (animator != null && animator.isRunning()) { + animator.end(); + } } @Override