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

Commit fbd59aaf authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Add feature id, isRootDisplayArea, isOrganized to DisplayArea dump"... 

Merge "Add feature id, isRootDisplayArea, isOrganized to DisplayArea dump" into sc-dev am: df0d17cf am: 8aa8a2b6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14537541

Change-Id: I0a0364141cb52de35849a2c66291bd640781b91f
parents 37c47e29 8aa8a2b6

core/proto/android/server/windowmanagerservice.proto

+3 −0
Original line number Diff line number Diff line
@@ -221,6 +221,9 @@ message DisplayAreaProto { 
    optional string name = 2 [ (.android.privacy).dest = DEST_EXPLICIT ];

    repeated DisplayAreaChildProto children = 3 [deprecated=true];

    optional bool is_task_display_area = 4;

    optional bool is_root_display_area = 5;

    optional int32 feature_id = 6;

    optional bool is_organized = 7;

}



/* represents a generic child of a DisplayArea */

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

+7 −1
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ import static android.window.DisplayAreaOrganizer.FEATURE_WINDOW_TOKENS; 


import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_ORIENTATION;

import static com.android.internal.util.Preconditions.checkState;

import static com.android.server.wm.DisplayAreaProto.FEATURE_ID;

import static com.android.server.wm.DisplayAreaProto.IS_ORGANIZED;

import static com.android.server.wm.DisplayAreaProto.IS_ROOT_DISPLAY_AREA;

import static com.android.server.wm.DisplayAreaProto.IS_TASK_DISPLAY_AREA;

import static com.android.server.wm.DisplayAreaProto.NAME;

import static com.android.server.wm.DisplayAreaProto.WINDOW_CONTAINER;
@@ -273,6 +276,9 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { 
        super.dumpDebug(proto, WINDOW_CONTAINER, logLevel);

        proto.write(NAME, mName);

        proto.write(IS_TASK_DISPLAY_AREA, isTaskDisplayArea());

        proto.write(IS_ROOT_DISPLAY_AREA, asRootDisplayArea() != null);

        proto.write(FEATURE_ID, mFeatureId);

        proto.write(IS_ORGANIZED, isOrganized());

        proto.end(token);

    }
@@ -515,7 +521,7 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { 
        return true;

    }



    protected boolean isTaskDisplayArea() {

    boolean isTaskDisplayArea() {

        return false;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -2131,7 +2131,7 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { 
    }



    @Override

    protected boolean isTaskDisplayArea() {

    boolean isTaskDisplayArea() {

        return true;

    }