summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chavi Weingarten <chaviw@google.com> 2023-02-07 20:11:24 +0000
committer Chavi Weingarten <chaviw@google.com> 2023-02-07 20:14:16 +0000
commitce14101c144b66bf8ec63b8669b51e7717f72897 (patch)
tree5754fbfe640ee7593b0786ffcfb9648ef9d76d5a
parent765f5e03c6eda60afef41f80beb62f8d2491490d (diff)
Merge conflict didn't pick up changes.
Change-Id: I195ebf30a87b7135a6cf3f9012947cfb794c14df
-rw-r--r--libs/gui/BLASTBufferQueue.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/libs/gui/BLASTBufferQueue.cpp b/libs/gui/BLASTBufferQueue.cpp
index d5431916cc..66c0041965 100644
--- a/libs/gui/BLASTBufferQueue.cpp
+++ b/libs/gui/BLASTBufferQueue.cpp
@@ -678,7 +678,6 @@ void BLASTBufferQueue::onFrameAvailable(const BufferItem& item) {
BBQ_TRACE();
bool waitForTransactionCallback = !mSyncedFrameNumbers.empty();
- bool waitForTransactionCallback = !mSyncedFrameNumbers.empty();
const bool syncTransactionSet = mTransactionReadyCallback != nullptr;
BQA_LOGV("onFrameAvailable-start syncTransactionSet=%s", boolToString(syncTransactionSet));