| commit | 64b317d755d880dab83a19f219248471a7b9b21d | [log] [tgz] |
|---|---|---|
| author | Hongwei Wang <hwwang@google.com> | Tue Jun 06 21:53:47 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 06 21:53:47 2023 +0000 |
| tree | e3fb88e1b32339195ac898d1178321ae08f426f2 | |
| parent | 4ac428af73185c09f82e3f75325bb3d4fe80addf [diff] | |
| parent | 264de2e91ada7dbcc836695b7586fdb384133592 [diff] |
Merge "Do not change the leash after completion" into udc-dev am: 264de2e91a Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23590699 Change-Id: Ia6d11b2da1a7c339797013fc3ac8c89c530d1bf1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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