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

Commit eb374759 authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Add identifier to WindowContainer proto 

Test: N/A
Change-Id: Ie79b3c7bf5221e01d766a67ac96dd6b73afa7696
parent e0131e56

core/proto/android/server/windowmanagerservice.proto

+3 −2
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ message ActivityRecordProto { 
    repeated .android.graphics.RectProto frozen_bounds = 23;

    optional bool visible = 24;

    reserved 25; // configuration_container

    optional IdentifierProto identifier = 26;

    optional IdentifierProto identifier = 26 [deprecated=true];

    optional string state = 27 [(.android.privacy).dest = DEST_EXPLICIT];

    optional bool front_of_task = 28;

    optional int32 proc_id = 29;
@@ -332,7 +332,7 @@ message WindowStateProto { 
    option (.android.msg_privacy).dest = DEST_AUTOMATIC;



    optional WindowContainerProto window_container = 1;

    optional IdentifierProto identifier = 2;

    optional IdentifierProto identifier = 2 [deprecated=true];

    // Unique identifier of a DisplayContent stack.

    optional int32 display_id = 3;

    // Unique identifier for the task stack.
@@ -428,6 +428,7 @@ message WindowContainerProto { 
    optional bool visible = 3;

    optional SurfaceAnimatorProto surface_animator = 4;

    repeated WindowContainerChildProto children = 5;

    optional IdentifierProto identifier = 6;

}



/* represents a generic child of a WindowContainer */

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

+0 −2
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ import static com.android.server.wm.ActivityRecordProto.DEFER_HIDING_CLIENT; 
import static com.android.server.wm.ActivityRecordProto.FILLS_PARENT;

import static com.android.server.wm.ActivityRecordProto.FRONT_OF_TASK;

import static com.android.server.wm.ActivityRecordProto.FROZEN_BOUNDS;

import static com.android.server.wm.ActivityRecordProto.IDENTIFIER;

import static com.android.server.wm.ActivityRecordProto.IS_ANIMATING;

import static com.android.server.wm.ActivityRecordProto.IS_WAITING_FOR_TRANSITION_START;

import static com.android.server.wm.ActivityRecordProto.LAST_ALL_DRAWN;
@@ -7586,7 +7585,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            bounds.dumpDebug(proto, FROZEN_BOUNDS);

        }



        writeIdentifierToProto(proto, IDENTIFIER);

        proto.write(STATE, mState.toString());

        proto.write(FRONT_OF_TASK, isRootOfTask());

        if (hasProcess()) {

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

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import static com.android.server.wm.WindowContainer.AnimationFlags.PARENTS; 
import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION;

import static com.android.server.wm.WindowContainerChildProto.WINDOW_CONTAINER;

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.VISIBLE;
@@ -1923,6 +1924,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
        super.dumpDebug(proto, CONFIGURATION_CONTAINER, logLevel);

        proto.write(ORIENTATION, mOrientation);

        proto.write(VISIBLE, isVisible);

        writeIdentifierToProto(proto, IDENTIFIER);

        if (mSurfaceAnimator.isAnimating()) {

            mSurfaceAnimator.dumpDebug(proto, SURFACE_ANIMATOR);

        }

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

+0 −2
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ import static com.android.server.wm.WindowStateProto.FINISHED_SEAMLESS_ROTATION_ 
import static com.android.server.wm.WindowStateProto.FORCE_SEAMLESS_ROTATION;

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

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

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

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;
@@ -3830,7 +3829,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 


        final long token = proto.start(fieldId);

        super.dumpDebug(proto, WINDOW_CONTAINER, logLevel);

        writeIdentifierToProto(proto, IDENTIFIER);

        proto.write(DISPLAY_ID, getDisplayId());

        proto.write(STACK_ID, getRootTaskId());

        mAttrs.dumpDebug(proto, ATTRIBUTES);