commit 1c0d91c812322a7c53949cd464e075db93ce6fd4
author Nataniel Borges <natanieljr@google.com> Fri Feb 15 15:29:39 2019 -0800
committer Nataniel Borges <natanieljr@google.com> Wed Feb 27 00:00:36 2019 +0000
tree 9c517aea2fe17867a7d3a9db08cfdc5cd53b648a
parent 114998a80761a9bb25dec7711deceda13b05d712

Remove id from RegionProto object

The region proto object contains an Id, which is assigned to the memory
address of the Region object.

This information is not necessary on winscope traces, remove.

Test: Flash a device. Collect a SF trace. Open trace in winscope. Check
if Id for region objects is removed from the property list

Change-Id: I4f91745d79d9f1812915836e5e7ac3b416c2052a

services/surfaceflinger/LayerProtoHelper.cpp

diff --git a/services/surfaceflinger/LayerProtoHelper.cpp b/services/surfaceflinger/LayerProtoHelper.cpp
index 02383a6..2d6d33c 100644
--- a/services/surfaceflinger/LayerProtoHelper.cpp
+++ b/services/surfaceflinger/LayerProtoHelper.cpp
@@ -49,8 +49,6 @@
     Region::const_iterator const tail = region.end();
     // Use a lambda do avoid writing the object header when the object is empty
     RegionProto* regionProto = getRegionProto();
-    uint64_t address = reinterpret_cast<uint64_t>(&region);
-    regionProto->set_id(address);
     while (head != tail) {
         std::function<RectProto*()> getProtoRect = [&]() { return regionProto->add_rect(); };
         writeToProto(*head, getProtoRect);

services/surfaceflinger/layerproto/LayerProtoParser.cpp

diff --git a/services/surfaceflinger/layerproto/LayerProtoParser.cpp b/services/surfaceflinger/layerproto/LayerProtoParser.cpp
index 7ab57f9..7288232 100644
--- a/services/surfaceflinger/layerproto/LayerProtoParser.cpp
+++ b/services/surfaceflinger/layerproto/LayerProtoParser.cpp
@@ -132,7 +132,6 @@
 
 LayerProtoParser::Region LayerProtoParser::generateRegion(const RegionProto& regionProto) {
     LayerProtoParser::Region region;
-    region.id = regionProto.id();
     for (int i = 0; i < regionProto.rect_size(); i++) {
         const RectProto& rectProto = regionProto.rect(i);
         region.rects.push_back(generateRect(rectProto));

services/surfaceflinger/layerproto/layers.proto

diff --git a/services/surfaceflinger/layerproto/layers.proto b/services/surfaceflinger/layerproto/layers.proto
index a0fb0a0..fd4695e 100644
--- a/services/surfaceflinger/layerproto/layers.proto
+++ b/services/surfaceflinger/layerproto/layers.proto
@@ -117,7 +117,7 @@
 }
 
 message RegionProto {
-  uint64 id = 1;
+  reserved 1;  // Previously: uint64 id
   repeated RectProto rect = 2;
 }