From 463bf0cd08d41bc2c1ded110d831f56daab887fe Mon Sep 17 00:00:00 2001
From: Yunfan Chen <yunfanc@google.com>
Date: Thu, 13 Oct 2022 17:09:36 +0900
Subject: Clear cached override frame when window removed

When removing a window, the corresponding WindowContainer of a
InsetsSourceProvider will be set to null, instead of directly removing
the provider. We need to clear all recorded information, including the
override frames to make sure the removal in effect to all windows.

Test: See b/252455307
Bug: 252455307
Change-Id: I2e59485fdf25af743afe918525ed5e6872e6fff7
---
 services/core/java/com/android/server/wm/InsetsSourceProvider.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/wm/InsetsSourceProvider.java b/services/core/java/com/android/server/wm/InsetsSourceProvider.java
index bf4b65da8b43..3a8fbbbaa77d 100644
--- a/services/core/java/com/android/server/wm/InsetsSourceProvider.java
+++ b/services/core/java/com/android/server/wm/InsetsSourceProvider.java
@@ -173,6 +173,7 @@ abstract class InsetsSourceProvider {
         mWindowContainer = windowContainer;
         // TODO: remove the frame provider for non-WindowState container.
         mFrameProvider = frameProvider;
+        mOverrideFrames.clear();
         mOverrideFrameProviders = overrideFrameProviders;
         if (windowContainer == null) {
             setServerVisible(false);
@@ -234,6 +235,8 @@ abstract class InsetsSourceProvider {
         updateSourceFrameForServerVisibility();
 
         if (mOverrideFrameProviders != null) {
+            // Not necessary to clear the mOverrideFrames here. It will be cleared every time the
+            // override frame provider updates.
             for (int i = mOverrideFrameProviders.size() - 1; i >= 0; i--) {
                 final int windowType = mOverrideFrameProviders.keyAt(i);
                 final Rect overrideFrame;
-- 
cgit v1.2.3-59-g8ed1b