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

Commit 4eecaa13 authored by chaviw's avatar chaviw
Browse files

Changed reserved proto values to deprecated. 

The reserved values prevent older protobuf files from getting parsed.
Instead deprecated unused proto values, but keep them around so winscope
can parse older protobuf dumps.

Test: winscope with protobuf file from older build
Fixes: 112389396
Change-Id: Id0b009044c1f312eca9b0d3d348543141b0cd2a9
parent 1ff73729

core/proto/android/server/windowmanagerservice.proto

+10 −13
Original line number Original line Diff line number Diff line
@@ -288,11 +288,10 @@ message WindowStateProto { 
    optional int32 stack_id = 4;

    optional int32 stack_id = 4;

    optional .android.view.WindowLayoutParamsProto attributes = 5;

    optional .android.view.WindowLayoutParamsProto attributes = 5;

    optional .android.graphics.RectProto given_content_insets = 6;

    optional .android.graphics.RectProto given_content_insets = 6;

    reserved 7 to 10;

    optional .android.graphics.RectProto frame = 7 [deprecated=true];

//    optional .android.graphics.RectProto frame = 7;

    optional .android.graphics.RectProto containing_frame = 8 [deprecated=true];

//    optional .android.graphics.RectProto containing_frame = 8;

    optional .android.graphics.RectProto parent_frame = 9 [deprecated=true];

//    optional .android.graphics.RectProto parent_frame = 9;

    optional .android.graphics.RectProto content_frame = 10 [deprecated=true];

//    optional .android.graphics.RectProto content_frame = 10;

    optional .android.graphics.RectProto content_insets = 11;

    optional .android.graphics.RectProto content_insets = 11;

    optional .android.graphics.RectProto surface_insets = 12;

    optional .android.graphics.RectProto surface_insets = 12;

    optional WindowStateAnimatorProto animator = 13;

    optional WindowStateAnimatorProto animator = 13;
@@ -305,18 +304,16 @@ message WindowStateProto { 
    optional int32 system_ui_visibility = 21;

    optional int32 system_ui_visibility = 21;

    optional bool has_surface = 22;

    optional bool has_surface = 22;

    optional bool is_ready_for_display = 23;

    optional bool is_ready_for_display = 23;

    reserved 24 to 28;

    optional .android.graphics.RectProto display_frame = 24 [deprecated=true];

//    optional .android.graphics.RectProto display_frame = 24;

    optional .android.graphics.RectProto overscan_frame = 25 [deprecated=true];

//    optional .android.graphics.RectProto overscan_frame = 25;

    optional .android.graphics.RectProto visible_frame = 26 [deprecated=true];

//    optional .android.graphics.RectProto visible_frame = 26;

    optional .android.graphics.RectProto decor_frame = 27 [deprecated=true];

//    optional .android.graphics.RectProto decor_frame = 27;

    optional .android.graphics.RectProto outset_frame = 28 [deprecated=true];

//    optional .android.graphics.RectProto outset_frame = 28;

    optional .android.graphics.RectProto overscan_insets = 29;

    optional .android.graphics.RectProto overscan_insets = 29;

    optional .android.graphics.RectProto visible_insets = 30;

    optional .android.graphics.RectProto visible_insets = 30;

    optional .android.graphics.RectProto stable_insets = 31;

    optional .android.graphics.RectProto stable_insets = 31;

    optional .android.graphics.RectProto outsets = 32;

    optional .android.graphics.RectProto outsets = 32;

    reserved 33;

    optional .android.view.DisplayCutoutProto cutout = 33 [deprecated=true];

//    optional .android.view.DisplayCutoutProto cutout = 33;

    optional bool remove_on_exit = 34;

    optional bool remove_on_exit = 34;

    optional bool destroying = 35;

    optional bool destroying = 35;

    optional bool removed = 36;

    optional bool removed = 36;