commit dc83d4b7ba27a5096e19884b548eb05e432bc3f2
author Vishnu Nair <vishnun@google.com> Thu Aug 15 16:29:20 2024 +0000
committer Vishnu Nair <vishnun@google.com> Tue Sep 10 02:25:14 2024 +0000
tree 4270c175f8ce617bf3bf3cc30f4e09b59f2192cf
parent 812dcabff8b4ff8cdc9efa0414001be6d44a7df8

Remove legacy layer states!

Remove all the unused layer states. Buffer info, frame rate and a few
lingering states remain. But the intention is to completely remove the
legacy layer class and prevent it from being a catch all super class again.

Flag: EXEMPT flag removal
Bug: 330785038
Test: presubmit
Change-Id: I8ce0bf0b0bcc7c69c7d397d0ffb1639a6dc4979a

services/surfaceflinger/LayerProtoHelper.cpp

diff --git a/services/surfaceflinger/LayerProtoHelper.cpp b/services/surfaceflinger/LayerProtoHelper.cpp
index 885c3d3..5eea45b 100644
--- a/services/surfaceflinger/LayerProtoHelper.cpp
+++ b/services/surfaceflinger/LayerProtoHelper.cpp
@@ -178,7 +178,7 @@
 }
 
 void LayerProtoHelper::writeToProto(
-        const WindowInfo& inputInfo, const wp<Layer>& touchableRegionBounds,
+        const WindowInfo& inputInfo,
         std::function<perfetto::protos::InputWindowInfoProto*()> getInputWindowInfoProto) {
     if (inputInfo.token == nullptr) {
         return;
@@ -208,13 +208,6 @@
     proto->set_global_scale_factor(inputInfo.globalScaleFactor);
     LayerProtoHelper::writeToProtoDeprecated(inputInfo.transform, proto->mutable_transform());
     proto->set_replace_touchable_region_with_crop(inputInfo.replaceTouchableRegionWithCrop);
-    auto cropLayer = touchableRegionBounds.promote();
-    if (cropLayer != nullptr) {
-        proto->set_crop_layer_id(cropLayer->sequence);
-        LayerProtoHelper::writeToProto(cropLayer->getScreenBounds(
-                                               false /* reduceTransparentRegion */),
-                                       [&]() { return proto->mutable_touchable_region_crop(); });
-    }
 }
 
 void LayerProtoHelper::writeToProto(const mat4 matrix,
@@ -482,7 +475,7 @@
     layerInfo->set_owner_uid(requestedState.ownerUid.val());
 
     if ((traceFlags & LayerTracing::TRACE_INPUT) && snapshot.hasInputInfo()) {
-        LayerProtoHelper::writeToProto(snapshot.inputInfo, {},
+        LayerProtoHelper::writeToProto(snapshot.inputInfo,
                                        [&]() { return layerInfo->mutable_input_window_info(); });
     }