commit 912e153ee6c8776faac825ebe9f7a9510256093f
author Vishnu Nair <vishnun@google.com> Mon Oct 16 15:43:45 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 16 15:43:45 2023 +0000
tree 994c46293a48d88c418265a513d3604bec4ac5cf
parent d893e073b928f74c0d1b783227eb11b863fd4206
parent 50858e61d95220b67a0eac75429c5b5f8a6076a5

Merge "Destroy transaction tracing from main thread" into main

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 2e97b2d..a796a72 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -7057,7 +7057,7 @@
                 if (mTransactionTracing) {
                     int arg = data.readInt32();
                     if (arg == -1) {
-                        mTransactionTracing.reset();
+                        mScheduler->schedule([&]() { mTransactionTracing.reset(); }).get();
                     } else if (arg > 0) {
                         // Transaction tracing is always running but allow the user to temporarily
                         // increase the buffer when actively debugging.