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

Commit 7282a770 authored by Yi Jiang's avatar Yi Jiang Committed by Android (Google) Code Review
Browse files

Merge "Fix LayerProtoHelper workaround to track layer ids" into main

parents a15e40e3 e1424a09

services/surfaceflinger/LayerProtoHelper.cpp

+1 −1
Original line number Diff line number Diff line
@@ -351,13 +351,13 @@ frontend::LayerSnapshot* LayerProtoFromSnapshotGenerator::getSnapshot( 
void LayerProtoFromSnapshotGenerator::writeHierarchyToProto(

        const frontend::LayerHierarchy& root, const frontend::LayerHierarchy::TraversalPath& path) {

    using Variant = frontend::LayerHierarchy::Variant;

    perfetto::protos::LayerProto* layerProto = mLayersProto.add_layers();

    const frontend::RequestedLayerState& layer = *root.getLayer();

    frontend::LayerSnapshot* snapshot = getSnapshot(path, layer);

    if (mVisitedLayers.find(snapshot->uniqueSequence) != mVisitedLayers.end()) {

        TransactionTraceWriter::getInstance().invoke("DuplicateLayer", /* overwrite= */ false);

        return;

    }

    perfetto::protos::LayerProto* layerProto = mLayersProto.add_layers();

    mVisitedLayers.insert(snapshot->uniqueSequence);

    LayerProtoHelper::writeSnapshotToProto(layerProto, layer, *snapshot, mTraceFlags);