From 0b5f00c3a6fec8a3f69c7800759d250cdd721f43 Mon Sep 17 00:00:00 2001 From: Garfield Tan Date: Wed, 12 Apr 2023 15:38:15 -0700 Subject: [PATCH] Add merged local insets to proto Bug: 263872611 Test: Caption insets are populated in CTS tests. Change-Id: Ia4e64d05ccf5f9f938237fbddb3911833b670b2f --- core/proto/android/server/windowmanagerservice.proto | 1 + services/core/java/com/android/server/wm/WindowState.java | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto index bb3089bb397aa..325ebbe885b40 100644 --- a/core/proto/android/server/windowmanagerservice.proto +++ b/core/proto/android/server/windowmanagerservice.proto @@ -458,6 +458,7 @@ message WindowStateProto { optional float global_scale = 44; repeated .android.graphics.RectProto keep_clear_areas = 45; repeated .android.graphics.RectProto unrestricted_keep_clear_areas = 46; + repeated .android.view.InsetsSourceProto mergedLocalInsetsSources = 47; } message IdentifierProto { diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index e5a49c3a0ee2c..482e17287631c 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -166,6 +166,7 @@ import static com.android.server.wm.WindowStateProto.IS_ON_SCREEN; import static com.android.server.wm.WindowStateProto.IS_READY_FOR_DISPLAY; import static com.android.server.wm.WindowStateProto.IS_VISIBLE; import static com.android.server.wm.WindowStateProto.KEEP_CLEAR_AREAS; +import static com.android.server.wm.WindowStateProto.MERGED_LOCAL_INSETS_SOURCES; import static com.android.server.wm.WindowStateProto.PENDING_SEAMLESS_ROTATION; import static com.android.server.wm.WindowStateProto.REMOVED; import static com.android.server.wm.WindowStateProto.REMOVE_ON_EXIT; @@ -4027,6 +4028,11 @@ class WindowState extends WindowContainer implements WindowManagerP for (Rect r : mUnrestrictedKeepClearAreas) { r.dumpDebug(proto, UNRESTRICTED_KEEP_CLEAR_AREAS); } + if (mMergedLocalInsetsSources != null) { + for (int i = 0; i < mMergedLocalInsetsSources.size(); ++i) { + mMergedLocalInsetsSources.valueAt(i).dumpDebug(proto, MERGED_LOCAL_INSETS_SOURCES); + } + } proto.end(token); }