Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clear cached override frame when window removed" into tm-qpr-dev am: f58e5c1683

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20187123

Change-Id: I37ccba0047a8320fe402f32d28db231ca0f6e8ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yunfan Chen
2022-10-25 03:59:10 +00:00
committed by Automerger Merge Worker
parent 318daf2093 f58e5c1683
commit 55d205a717
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/InsetsSourceProvider.java
View File

@@ -173,6 +173,7 @@ abstract class InsetsSourceProvider {
mWindowContainer = windowContainer; mWindowContainer = windowContainer;
// TODO: remove the frame provider for non-WindowState container. // TODO: remove the frame provider for non-WindowState container.
mFrameProvider = frameProvider; mFrameProvider = frameProvider;
mOverrideFrames.clear();
mOverrideFrameProviders = overrideFrameProviders; mOverrideFrameProviders = overrideFrameProviders;
if (windowContainer == null) { if (windowContainer == null) {
setServerVisible(false); setServerVisible(false);
@@ -234,6 +235,8 @@ abstract class InsetsSourceProvider {
updateSourceFrameForServerVisibility(); updateSourceFrameForServerVisibility();
if (mOverrideFrameProviders != null) { 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--) { for (int i = mOverrideFrameProviders.size() - 1; i >= 0; i--) {
final int windowType = mOverrideFrameProviders.keyAt(i); final int windowType = mOverrideFrameProviders.keyAt(i);
final Rect overrideFrame; final Rect overrideFrame;