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

Commit 9978b936 authored by Vishnu Nair's avatar Vishnu Nair
Browse files

SF: Fix incompatible proto definitions between pi and master branches 

Proto field buffer_transform with id 37 does not exist in Pi. This conflicts with curr_frame
introduced in Pi with id 37 and Master with id 38. Since its too late to fix in Pi, lets
fix this in Master.

This will break previously generated traces in Master but will make Pi and Master proto
definitions compatible going forward.

Test: Build Winscope with new proto definitions. Open traces from Pi and Master builds

Change-Id: I208295d417ec9dc7739ad7991841b55c18a3c938
parent 7a4dcdf8

services/surfaceflinger/layerproto/layers.proto

+4 −4
Original line number Diff line number Diff line
@@ -80,12 +80,12 @@ message LayerProto { 
  optional int32 hwc_composition_type = 35;

  // If it's a buffer layer, indicate if the content is protected

  optional bool is_protected = 36;

  // If active_buffer is not null, record its transform

  optional TransformProto buffer_transform = 37;

  // Current frame number being rendered.

  optional uint64 curr_frame = 38;

  optional uint64 curr_frame = 37;

  // A list of barriers that the layer is waiting to update state.

  repeated BarrierLayerProto barrier_layer = 39;

  repeated BarrierLayerProto barrier_layer = 38;

  // If active_buffer is not null, record its transform.

  optional TransformProto buffer_transform = 39;

}



message PositionProto {