From ce14101c144b66bf8ec63b8669b51e7717f72897 Mon Sep 17 00:00:00 2001 From: Chavi Weingarten Date: Tue, 7 Feb 2023 20:11:24 +0000 Subject: Merge conflict didn't pick up changes. Change-Id: I195ebf30a87b7135a6cf3f9012947cfb794c14df --- libs/gui/BLASTBufferQueue.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'libs/gui/BLASTBufferQueue.cpp') 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)); -- cgit v1.2.3-59-g8ed1b