commit 159a59865b7eed1bd43cb93e352ad8fccb01f596
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 08 22:37:51 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 08 22:37:51 2021 +0000
tree d0b8bd080a8ab5e2f332b0e54b2aa426c1bb3ae3
parent afb4c5f2440ab0d4a50d1e3ac15d06124f8bcc7e
parent 93a3c0b68c17be755c96224d97984dde4e468c34

Merge "Fix dumpsys SurfaceFlinger --frame-events" am: 73ab3a30ac am: 93a3c0b68c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1534566

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I50c78f12f9c12feab82f1a676c8b93d313ff6a3c

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index ab623a0..12fa23b 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -4502,12 +4502,9 @@
 
 void SurfaceFlinger::dumpFrameEventsLocked(std::string& result) {
     result.append("Layer frame timestamps:\n");
-
-    const LayerVector& currentLayers = mCurrentState.layersSortedByZ;
-    const size_t count = currentLayers.size();
-    for (size_t i=0 ; i<count ; i++) {
-        currentLayers[i]->dumpFrameEvents(result);
-    }
+    // Traverse all layers to dump frame-events for each layer
+    mCurrentState.traverseInZOrder(
+        [&] (Layer* layer) { layer->dumpFrameEvents(result); });
 }
 
 void SurfaceFlinger::dumpBufferingStats(std::string& result) const {