From 728dba1f95927d8f7acb52d09c65c486f81ea50d Mon Sep 17 00:00:00 2001 From: Vishnu Nair Date: Wed, 29 Jun 2022 22:13:49 +0000 Subject: BBQ: Remove BufferFreedListener If BBQ is destroyed without calling abandon, its BufferItemConsumer will call onBufferFreed. Since BBQ registers itself as the BufferFreedListener we end up trying to promote and destroy the BBQ again. The BufferFreedListener is not used so as a simple fix, we remove the listener. Test: presubmit Bug: 200246498 Change-Id: I7b2be265b3c09d691cc0c41b80c73067f9a8b84d --- libs/gui/BLASTBufferQueue.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'libs/gui/BLASTBufferQueue.cpp') diff --git a/libs/gui/BLASTBufferQueue.cpp b/libs/gui/BLASTBufferQueue.cpp index f34061492a..77022dc9b8 100644 --- a/libs/gui/BLASTBufferQueue.cpp +++ b/libs/gui/BLASTBufferQueue.cpp @@ -159,7 +159,6 @@ BLASTBufferQueue::BLASTBufferQueue(const std::string& name, bool updateDestinati id++; mBufferItemConsumer->setName(String8(consumerName.c_str())); mBufferItemConsumer->setFrameAvailableListener(this); - mBufferItemConsumer->setBufferFreedListener(this); ComposerServiceAIDL::getComposerService()->getMaxAcquiredBufferCount(&mMaxAcquiredBuffers); mBufferItemConsumer->setMaxAcquiredBufferCount(mMaxAcquiredBuffers); @@ -1114,7 +1113,6 @@ void BLASTBufferQueue::abandon() { if (mBufferItemConsumer != nullptr) { mBufferItemConsumer->abandon(); mBufferItemConsumer->setFrameAvailableListener(nullptr); - mBufferItemConsumer->setBufferFreedListener(nullptr); } mBufferItemConsumer = nullptr; mConsumer = nullptr; -- cgit v1.2.3-59-g8ed1b