Abort a pending failed pip-enter transition

Otherwise, it will go through the normal collection
logic without making a request.

Bug: 278781290
Test: Try to enter pip during an existing transition which
      removes it's task.
Change-Id: I3b22a7b05edeb8484677f469bfa823456de4d009

1 files changed, 3 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index ff2c71999188..0a332a3683c5 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -3643,6 +3643,9 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
             synchronized (mGlobalLock) {
                 if (r.getParent() == null) {
                     Slog.e(TAG, "Skip enterPictureInPictureMode, destroyed " + r);
+                    if (transition != null) {
+                        transition.abort();
+                    }
                     return;
                 }
                 EventLogTags.writeWmEnterPip(r.mUserId, System.identityHashCode(r),