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

Commit fd48767d authored by Pablo Gamito's avatar Pablo Gamito Committed by Nataniel Borges
Browse files

[DO NOT MERGE] Dump WindowContainer SurfaceControls to proto 

Test: Data appears in Winscope
Bug: 197712697
Change-Id: I5a2704f4e910529d81698768a6e657e4f823d829
(cherry picked from commit afaa2fed)
parent 865a06b2

core/proto/android/server/windowmanagerservice.proto

+1 −0
Original line number Diff line number Diff line
@@ -480,6 +480,7 @@ message WindowContainerProto { 
    optional SurfaceAnimatorProto surface_animator = 4;

    repeated WindowContainerChildProto children = 5;

    optional IdentifierProto identifier = 6;

    optional .android.view.SurfaceControlProto surface_control = 7;

}



/* represents a generic child of a WindowContainer */

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

+4 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import static com.android.server.wm.WindowContainerProto.CONFIGURATION_CONTAINER 
import static com.android.server.wm.WindowContainerProto.IDENTIFIER;

import static com.android.server.wm.WindowContainerProto.ORIENTATION;

import static com.android.server.wm.WindowContainerProto.SURFACE_ANIMATOR;

import static com.android.server.wm.WindowContainerProto.SURFACE_CONTROL;

import static com.android.server.wm.WindowContainerProto.VISIBLE;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM;

import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
@@ -2428,6 +2429,9 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
        if (mSurfaceAnimator.isAnimating()) {

            mSurfaceAnimator.dumpDebug(proto, SURFACE_ANIMATOR);

        }

        if (mSurfaceControl != null) {

            mSurfaceControl.dumpDebug(proto, SURFACE_CONTROL);

        }



        // add children to proto

        for (int i = 0; i < getChildCount(); i++) {