From b864abe37b3cf59461bf89e172513e3bab5e8f6b Mon Sep 17 00:00:00 2001
From: Robert Horvath <robhor@google.com>
Date: Tue, 8 Feb 2022 16:46:11 +0100
Subject: [PATCH] Remove keep clear areas when a view detaches

If a View detaches, its keep clear areas should no longer be considered
when placing a PiP.

Bug: 209577354
Test: atest KeepClearRectsTests#testIgnoreKeepClearRectsFromDetachedViews
Change-Id: I0caa74d4bef2ee157fc3f48747788e30752d09ad
---
 core/java/android/view/View.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 4dc1fca24f36d..286b502791c80 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -21142,6 +21142,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
         }
 
         notifyEnterOrExitForAutoFillIfNeeded(false);
+
+        if (info != null && !collectPreferKeepClearRects().isEmpty()) {
+            info.mViewRootImpl.updateKeepClearRectsForView(this);
+        }
     }
 
     /**