diff options
| -rw-r--r-- | core/proto/android/server/windowmanagerservice.proto | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowState.java | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto index bb3089bb397a..325ebbe885b4 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 d1618e9a278b..678d4c863d5d 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<WindowState> 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); } |