| commit | b407eca5c7244767991c8a660b37832038b7b714 | [log] [tgz] |
|---|---|---|
| author | chaviw <chaviw@google.com> | Thu Sep 09 16:15:51 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 09 16:15:51 2021 +0000 |
| tree | b105c81837675e144b1e8035476dd1ccad7ad010 | |
| parent | 855db4415ee2eeaa2b28bca4728e4aaee401649c [diff] | |
| parent | bc347bc71f28f2e7688b831a3b2722afd46440c9 [diff] |
Fix bug where layers aren't shown in SurfaceFlinger dump. am: a2b9fab57a am: bc347bc71f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15787838 Change-Id: I2bdddd40799122216ad99e1c172d895445c8f980
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index f79c861..d70e2e9 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -4654,7 +4654,7 @@ result.append(traceFileProto.SerializeAsString()); } else { // Dump info that we need to access from the main thread - const auto layerTree = LayerProtoParser::generateLayerTree(layersProto); + const auto layerTree = LayerProtoParser::generateLayerTree(layersTrace->layers()); result.append(LayerProtoParser::layerTreeToString(layerTree)); result.append("\n"); dumpOffscreenLayers(result);