diff options
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java index 07f2e95dfcb1..a69d373de24c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java @@ -795,11 +795,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, "%s: Unrecognized token: %s", TAG, token); return; } - onExitPipFinished(info); - if (Transitions.ENABLE_SHELL_TRANSITIONS) { - mPipTransitionController.forceFinishTransition(); - } final PipAnimationController.PipTransitionAnimator<?> animator = mPipAnimationController.getCurrentAnimator(); if (animator != null) { @@ -810,6 +806,12 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, animator.removeAllListeners(); animator.cancel(); } + + onExitPipFinished(info); + + if (Transitions.ENABLE_SHELL_TRANSITIONS) { + mPipTransitionController.forceFinishTransition(); + } } @Override |