Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76bec8ed authored by Felix Stern's avatar Felix Stern Committed by Android (Google) Code Review
Browse files

Merge "Adding Requested Visible Types of WindowState to Winscope dump" into main

parents 3dcc42d8 5866197a

core/proto/android/server/windowmanagerservice.proto

+1 −0
Original line number Diff line number Diff line
@@ -464,6 +464,7 @@ message WindowStateProto { 
    repeated .android.graphics.RectProto keep_clear_areas = 45;

    repeated .android.graphics.RectProto unrestricted_keep_clear_areas = 46;

    repeated .android.view.InsetsSourceProto mergedLocalInsetsSources = 47;

    optional int32 requested_visible_types = 48;

}



message IdentifierProto {

services/core/java/com/android/server/wm/WindowState.java

+2 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ 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;

import static com.android.server.wm.WindowStateProto.REQUESTED_HEIGHT;

import static com.android.server.wm.WindowStateProto.REQUESTED_VISIBLE_TYPES;

import static com.android.server.wm.WindowStateProto.REQUESTED_WIDTH;

import static com.android.server.wm.WindowStateProto.STACK_ID;

import static com.android.server.wm.WindowStateProto.SURFACE_INSETS;
@@ -3988,6 +3989,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        proto.write(FORCE_SEAMLESS_ROTATION, mForceSeamlesslyRotate);

        proto.write(HAS_COMPAT_SCALE, hasCompatScale());

        proto.write(GLOBAL_SCALE, mGlobalScale);

        proto.write(REQUESTED_VISIBLE_TYPES, mRequestedVisibleTypes);

        for (Rect r : mKeepClearAreas) {

            r.dumpDebug(proto, KEEP_CLEAR_AREAS);

        }