Skip to content

Commit 5cef632

Browse files
committed
proto: change WindowManager child_tokens format
This commit changes the WindowManager's child_tokens field from a repeated int32 to a repeated IdentifierProto message. Thus the WindowManager incremental tracing can signal to the ProtoVM when the list becomes empty, emitting an empty IndentifierProto message. This is a breaking change, but acceptable as the field is not being used yet. Bug: 512718675 Change-Id: I8b32b36ac3d691c5389a0b5a1174c7d2a82113f8
1 parent 4b69bf9 commit 5cef632

2 files changed

Lines changed: 12 additions & 7 deletions

File tree

protos/third_party/android/frameworks/base/proto/tracing/winscope/server/windowmanagerservice.proto

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,8 @@ message InsetsControlTargetProto {
282282
// represents DisplayArea object
283283
message DisplayAreaProto {
284284
optional WindowContainerProto window_container = 1;
285-
optional string name = 2 [(.com.android.internal.privacy).dest = DEST_EXPLICIT];
285+
optional string name = 2
286+
[(.com.android.internal.privacy).dest = DEST_EXPLICIT];
286287
repeated DisplayAreaChildProto children = 3 [deprecated = true];
287288
optional bool is_task_display_area = 4;
288289
optional bool is_root_display_area = 5;
@@ -407,7 +408,8 @@ message TaskProto {
407408
optional int32 display_id = 15 [deprecated = true];
408409
optional int32 root_task_id = 16;
409410
optional int32 activity_type = 17 [
410-
(.com.android.internal.typedef) = "android.app.WindowConfiguration.ActivityType",
411+
(.com.android.internal.typedef) =
412+
"android.app.WindowConfiguration.ActivityType",
411413
deprecated = true
412414
];
413415
optional int32 resize_mode = 18
@@ -443,7 +445,8 @@ message TaskFragmentProto {
443445

444446
// represents ActivityRecordProto
445447
message ActivityRecordProto {
446-
optional string name = 1 [(.com.android.internal.privacy).dest = DEST_EXPLICIT];
448+
optional string name = 1
449+
[(.com.android.internal.privacy).dest = DEST_EXPLICIT];
447450
optional WindowTokenProto window_token = 2;
448451
optional bool last_surface_showing = 3;
449452
optional bool is_waiting_for_transition_start = 4;
@@ -471,7 +474,8 @@ message ActivityRecordProto {
471474
// configuration_container
472475
reserved 25;
473476
optional IdentifierProto identifier = 26 [deprecated = true];
474-
optional string state = 27 [(.com.android.internal.privacy).dest = DEST_EXPLICIT];
477+
optional string state = 27
478+
[(.com.android.internal.privacy).dest = DEST_EXPLICIT];
475479
optional bool front_of_task = 28;
476480
optional int32 proc_id = 29;
477481
optional bool translucent = 30;
@@ -580,7 +584,8 @@ message IdentifierProto {
580584
optional int32 user_id = 2;
581585
// Either a component name/string (eg: "com.android.settings/.FallbackHome")
582586
// or a window title ("NavigationBar").
583-
optional string title = 3 [(.com.android.internal.privacy).dest = DEST_EXPLICIT];
587+
optional string title = 3
588+
[(.com.android.internal.privacy).dest = DEST_EXPLICIT];
584589
}
585590

586591
// represents WindowStateAnimator
@@ -622,7 +627,7 @@ message WindowContainerProto {
622627
optional IdentifierProto identifier = 6;
623628
optional SurfaceControlProto surface_control = 7;
624629
optional bool visible_requested = 8;
625-
repeated int32 child_tokens = 9;
630+
repeated IdentifierProto child_tokens = 9;
626631
}
627632

628633
// represents a generic child of a WindowContainer
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8faadc66600895ee142225ea724c149d832e638f11b87cf57dadcdadac77daac
1+
efcdc6767f39b15d4bcb1c56d40dee597f392f191cfb279bbb5ade312cdfed99

0 commit comments

Comments
 (0)