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

Commit a292de37 authored by Ryo Okuda's avatar Ryo Okuda Committed by Android (Google) Code Review
Browse files

Merge "Create all Insets logs for Winscope"

parents e9e684d1 2f7f7c8d

core/proto/android/server/windowmanagerservice.proto

+2 −0
Original line number Diff line number Diff line
@@ -211,6 +211,8 @@ message DisplayContentProto { 


    optional DisplayRotationProto display_rotation = 33;

    optional int32 ime_policy = 34;



    repeated InsetsSourceProviderProto insets_source_providers = 35;

}



/* represents DisplayArea object */

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

+10 −4
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ import static com.android.server.wm.DisplayContentProto.IME_POLICY; 
import static com.android.server.wm.DisplayContentProto.INPUT_METHOD_CONTROL_TARGET;

import static com.android.server.wm.DisplayContentProto.INPUT_METHOD_INPUT_TARGET;

import static com.android.server.wm.DisplayContentProto.INPUT_METHOD_TARGET;

import static com.android.server.wm.DisplayContentProto.INSETS_SOURCE_PROVIDERS;

import static com.android.server.wm.DisplayContentProto.OPENING_APPS;

import static com.android.server.wm.DisplayContentProto.RESUMED_ACTIVITY;

import static com.android.server.wm.DisplayContentProto.ROOT_DISPLAY_AREA;
@@ -3226,10 +3227,15 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        if (mCurrentFocus != null) {

            mCurrentFocus.dumpDebug(proto, CURRENT_FOCUS, logLevel);

        }

        if (mInsetsStateController != null

                && mInsetsStateController.getImeSourceProvider() != null) {

            mInsetsStateController.getImeSourceProvider().dumpDebug(proto,

                    IME_INSETS_SOURCE_PROVIDER, logLevel);

        if (mInsetsStateController != null) {

            for (@InternalInsetsType int type = 0; type < InsetsState.SIZE; type++) {

                final InsetsSourceProvider provider = mInsetsStateController.peekSourceProvider(

                        type);

                if (provider != null) {

                    provider.dumpDebug(proto, type == ITYPE_IME ? IME_INSETS_SOURCE_PROVIDER :

                            INSETS_SOURCE_PROVIDERS, logLevel);

                }

            }

        }

        proto.write(IME_POLICY, getImePolicy());

        proto.end(token);