commit e684a8b85177829eddfaba6bd0555f2c2abcadae
author Andy Hung <hunga@google.com> Mon Jan 11 17:09:01 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 11 17:09:01 2021 +0000
tree 4b876cca0b074ce8e4544245e7a091998c54fbd4
parent 73ab3a30ac6a1dd63f9257a091546f10cfa51811
parent f37d1bd3d9053ee580c5ce51cfe0f3ceeae71cef

Merge "Parcel: Add vector read size bounds check"

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 39f923f..02b5324 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -4501,12 +4501,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 {