| commit | 9a5ec53842d6b25a32d2fe5fe13ef41e517d5e0d | [log] [tgz] |
|---|---|---|
| author | Vishnu Nair <vishnun@google.com> | Thu Apr 20 23:53:11 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 20 23:53:11 2023 +0000 |
| tree | d45a334d51e7b1e9461d8d4b9f2c869d057a7e61 | |
| parent | 996d246d42a3725b76e690f8e28519198f30a4d4 [diff] | |
| parent | dbf65411bbd51a0ed1eac9bf9e4fc2ad53a80e7f [diff] |
Merge "[sf] fix layer trace generation with new fe" into udc-dev am: dbf65411bb Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22763931 Change-Id: I587817649db8e00dad137a8624f2719503042fa3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index a6f4630..38f8db0 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -5847,8 +5847,8 @@ return layersProto; } - return LayerProtoFromSnapshotGenerator(mLayerSnapshotBuilder, mFrontEndDisplayInfos, {}, - traceFlags) + return LayerProtoFromSnapshotGenerator(mLayerSnapshotBuilder, mFrontEndDisplayInfos, + mLegacyLayers, traceFlags) .generate(mLayerHierarchyBuilder.getHierarchy()); }