commit 4efab5d7614f1b809ea89c6226d0a0555f79b255
author Patrick Williams <pdwilliams@google.com> Fri Aug 23 12:54:45 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 23 12:54:45 2024 +0000
tree 4756963228e2b9a1d6b137afc811abcbf0a5bd3b
parent 381aea5968566d6a298cf34dfdfa65b7c42d8ac5
parent 1a37b731c88f79f81c4add642b2a06b06d38ea2d

Merge "Fix transactionCallbackThunk lifetime issue" into main

libs/gui/BLASTBufferQueue.cpp

diff --git a/libs/gui/BLASTBufferQueue.cpp b/libs/gui/BLASTBufferQueue.cpp
index f065ffa..1fb59fd 100644
--- a/libs/gui/BLASTBufferQueue.cpp
+++ b/libs/gui/BLASTBufferQueue.cpp
@@ -356,8 +356,9 @@
     if (context == nullptr) {
         return;
     }
-    sp<BLASTBufferQueue> bq = static_cast<BLASTBufferQueue*>(context);
+    auto bq = static_cast<BLASTBufferQueue*>(context);
     bq->transactionCallback(latchTime, presentFence, stats);
+    bq->decStrong((void*)transactionCallbackThunk);
 }
 
 void BLASTBufferQueue::transactionCallback(nsecs_t /*latchTime*/, const sp<Fence>& /*presentFence*/,
@@ -413,8 +414,6 @@
             BQA_LOGE("No matching SurfaceControls found: mSurfaceControlsWithPendingCallback was "
                      "empty.");
         }
-
-        decStrong((void*)transactionCallbackThunk);
     }
 }