| commit | 7ef8b680cdb3ed77d6b4aa92c5b3d5972a865e57 | [log] [tgz] |
|---|---|---|
| author | Vishnu Nair <vishnun@google.com> | Fri Apr 21 00:28:07 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 21 00:28:07 2023 +0000 |
| tree | e03f865f1c185a05b44ae4590e3e1797b0df8d86 | |
| parent | be8dfdec0a22e28a06fed31e231b24bac2e69012 [diff] | |
| parent | 9a5ec53842d6b25a32d2fe5fe13ef41e517d5e0d [diff] |
Merge "[sf] fix layer trace generation with new fe" into udc-dev am: dbf65411bb am: 9a5ec53842 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22763931 Change-Id: Iac5cd16b98b0527ae65178d41d2bf81a3c1bb02c 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 e4ee38a..5746fae 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -5849,8 +5849,8 @@ return layersProto; } - return LayerProtoFromSnapshotGenerator(mLayerSnapshotBuilder, mFrontEndDisplayInfos, {}, - traceFlags) + return LayerProtoFromSnapshotGenerator(mLayerSnapshotBuilder, mFrontEndDisplayInfos, + mLegacyLayers, traceFlags) .generate(mLayerHierarchyBuilder.getHierarchy()); }