Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add feature id, isRootDisplayArea, isOrganized to DisplayArea dump" into sc-dev

Browse Source
This commit is contained in:
Chris Li
2021-05-17 17:17:18 +00:00
committed by Android (Google) Code Review
parent 63e732e89e 0353f53b9a
commit df0d17cf52
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/proto/android/server/windowmanagerservice.proto
View File

@@ -221,6 +221,9 @@ message DisplayAreaProto {
optional string name = 2 [ (.android.privacy).dest = DEST_EXPLICIT ]; optional string name = 2 [ (.android.privacy).dest = DEST_EXPLICIT ];
repeated DisplayAreaChildProto children = 3 [deprecated=true]; repeated DisplayAreaChildProto children = 3 [deprecated=true];
optional bool is_task_display_area = 4; 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 */ /* represents a generic child of a DisplayArea */

8
services/core/java/com/android/server/wm/DisplayArea.java
View File

@@ -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.protolog.ProtoLogGroup.WM_DEBUG_ORIENTATION;
import static com.android.internal.util.Preconditions.checkState; 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.IS_TASK_DISPLAY_AREA;
import static com.android.server.wm.DisplayAreaProto.NAME; import static com.android.server.wm.DisplayAreaProto.NAME;
import static com.android.server.wm.DisplayAreaProto.WINDOW_CONTAINER; 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); super.dumpDebug(proto, WINDOW_CONTAINER, logLevel);
proto.write(NAME, mName); proto.write(NAME, mName);
proto.write(IS_TASK_DISPLAY_AREA, isTaskDisplayArea()); 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); proto.end(token);
} }
@@ -515,7 +521,7 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> {
return true; return true;
} }
protected boolean isTaskDisplayArea() { boolean isTaskDisplayArea() {
return false; return false;
} }

2
services/core/java/com/android/server/wm/TaskDisplayArea.java
View File

@@ -2131,7 +2131,7 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> {
} }
@Override @Override
protected boolean isTaskDisplayArea() { boolean isTaskDisplayArea() {
return true; return true;
} }