From 092b4a0f92d444f1a818f4bdcd71490148487776 Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Wed, 8 Dec 2021 09:23:53 -0800
Subject: [PATCH] Remove mTargetViewContainer safely

Per bugreport there is chance that
PipDismissTargetHandler#mTargetViewContainer is not attached to window
manager when we try to remove it in PipDismissTargetHandler#init on
overlay changes (such as changing wallpaper)

Bug: 209796452
Test: N/A not able to reproduce on raven
Change-Id: Ic2fbe2d59145afa2c994bc75446d60f8c4415e58
---
 .../com/android/wm/shell/pip/phone/PipDismissTargetHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipDismissTargetHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipDismissTargetHandler.java
index 8467cc5fc5911..92a3598910035 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipDismissTargetHandler.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipDismissTargetHandler.java
@@ -122,7 +122,7 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen
 
         if (mTargetViewContainer != null) {
             // init can be called multiple times, remove the old one from view hierarchy first.
-            mWindowManager.removeViewImmediate(mTargetViewContainer);
+            cleanUpDismissTarget();
         }
 
         mTargetView = new DismissCircleView(mContext);