From 7941ecfe603da0955783c5368ae1959aaaaf89c0 Mon Sep 17 00:00:00 2001 From: Kean Mariotti Date: Thu, 27 Apr 2023 16:42:13 +0000 Subject: Revert^2 Revert layer proto format back to proto2 Perfetto doesn't support proto3, hence reverted to proto2. This reverts commit dcc0bab76dbf3156f18e4dd2697aa7220ad7a8e0 Bug: b/284424784 Test: atest libsurfaceflinger_unittest && atest transactiontrace_testsuite Change-Id: I107a56f57f547056c44877e776d169dd21db618a --- services/surfaceflinger/Layer.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'services/surfaceflinger/Layer.cpp') diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index d4babdbd79..9a5173ba9b 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -2325,15 +2325,11 @@ void Layer::writeToProtoCommonState(perfetto::protos::LayerProto* layerInfo, auto parent = useDrawing ? mDrawingParent.promote() : mCurrentParent.promote(); if (parent != nullptr) { layerInfo->set_parent(parent->sequence); - } else { - layerInfo->set_parent(-1); } auto zOrderRelativeOf = state.zOrderRelativeOf.promote(); if (zOrderRelativeOf != nullptr) { layerInfo->set_z_order_relative_of(zOrderRelativeOf->sequence); - } else { - layerInfo->set_z_order_relative_of(-1); } layerInfo->set_is_relative_of(state.isRelativeOf); -- cgit v1.2.3-59-g8ed1b