summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHongwei Wang <hwwang@google.com>2021-12-08 23:21:19 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-12-08 23:21:19 +0000
commitb1db354749a8010f5dfefbda520cc144ed1d331f (patch)
tree0c26760b1d2b98da90f7b00e4494bd95199cb192
parent1ac557da23f0b3c4a3c08fce3822e135be2e3c47 (diff)
parent241e35db6046b941d3fbe8ff70c9fbf65f754052 (diff)
Merge "Remove mTargetViewContainer safely" into sc-v2-dev am: 77f8728004 am: 241e35db60
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16421894 Change-Id: I14a56aac54697a7196b4c91fe58d248a58c2a4b5
-rw-r--r--libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipDismissTargetHandler.java2
1 files changed, 1 insertions, 1 deletions
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 8467cc5fc591..92a359891003 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);