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

Commit 0353f53b authored by Chris Li's avatar Chris Li
Browse files

Add feature id, isRootDisplayArea, isOrganized to DisplayArea dump 

This is to allow us to verify DisplayArea policy in CTS

Bug: 175840704
Test: atest CtsWindowManagerDeviceTestCases:DisplayAreaTests
Change-Id: I60d9fe1ee68b38e2812feb9a818f9d4a67edc694
parent 22b214ba

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;

    }