commit 442dbd14ffb4f053e28fa5aa5d343f8acb1f393c
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 26 13:19:31 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 26 13:19:31 2022 +0000
tree 9ae7de860f2d5f3d2e3743b998ed96c1aea784bf
parent 4e42dc053fad9988b2e3c49baae0cb41948bc1a9
parent 8a35943e5f1526539feed260f4dfbf7b67f8d35f

Merge "Remove lingering content overlays in onTaskVanished" into tm-dev

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java

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 56e99ee..694b693 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
@@ -801,11 +801,7 @@
                     "%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) {
@@ -817,6 +813,12 @@
             animator.removeAllListeners();
             animator.cancel();
         }
+
+        onExitPipFinished(info);
+
+        if (Transitions.ENABLE_SHELL_TRANSITIONS) {
+            mPipTransitionController.forceFinishTransition();
+        }
     }
 
     @Override