commit dfb122d9d1544f261177207a79c3c0d67a7b7da4
author Kean Mariotti <keanmariotti@google.com> Mon Sep 30 09:16:40 2024 +0000
committer Kean Mariotti <keanmariotti@google.com> Mon Sep 30 09:23:44 2024 +0000
tree c854c9012b4a022247eecb2b6e479d828c1a847f
parent 26e74e586afad4a62a37cfa9962339386a355617

Fix lambda capture

The scheduled takeLayersSnapshotProto() call is not waited anymore
(see deadlock fix for b/313130597), hence the traceFlags local
variable must be captured by value to avoid referencing it after
it goes out of scope.

Fix: 370018409
Flag: EXEMPT bugfix
Test: presubmit
Change-Id: I0285ba70475cec3e4c54787303aea535bf866d72

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 06560d0..692d0f4 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -952,7 +952,7 @@
                 // Do not wait the future to avoid deadlocks
                 // between main and Perfetto threads (b/313130597)
                 static_cast<void>(mScheduler->schedule(
-                        [&, onLayersSnapshot]() FTL_FAKE_GUARD(mStateLock)
+                        [&, traceFlags, onLayersSnapshot]() FTL_FAKE_GUARD(mStateLock)
                                 FTL_FAKE_GUARD(kMainThreadContext) {
                                     auto snapshot =
                                             takeLayersSnapshotProto(traceFlags, TimePoint::now(),