commit 4fd10d8d132754131911593ebde6281931e5f54b
author Chavi Weingarten <chaviw@google.com> Mon Mar 29 14:13:16 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 29 14:13:16 2021 +0000
tree 14cd960dc59389ef3db0120f19feaddb8dac3175
parent 15e58709c6d3bf3e00acfd92281c61af4ac55fa0
parent aad6cf53e8cf0f527d2ef0415922f04ad1b8680f

Merge "Clear transaction that's passed to mergeWithNextTransaction" into sc-dev

libs/gui/BLASTBufferQueue.cpp

diff --git a/libs/gui/BLASTBufferQueue.cpp b/libs/gui/BLASTBufferQueue.cpp
index 8da97bb..1976b49 100644
--- a/libs/gui/BLASTBufferQueue.cpp
+++ b/libs/gui/BLASTBufferQueue.cpp
@@ -606,7 +606,9 @@
         // Apply the transaction since we have already acquired the desired frame.
         t->apply();
     } else {
-        mPendingTransactions.emplace_back(frameNumber, std::move(*t));
+        mPendingTransactions.emplace_back(frameNumber, *t);
+        // Clear the transaction so it can't be applied elsewhere.
+        t->clear();
     }
 }