From 95971c8172495f7b6a0ede1a3508472b9a4e7b36 Mon Sep 17 00:00:00 2001 From: Dan Stoza Date: Mon, 26 Jun 2017 14:27:18 -0700 Subject: libgui: New mutex for ConsumerBase frame callbacks Adds a new mutex to protect ConsumerBase's mFrameAvailableListener separately from the main mMutex. This prevents deadlocks when trying to perform callbacks in response to other calls that come through ConsumerBase. Bug: 62915791 Test: EncodeVirtualDisplayWithCompositionTest# testRenderingMaxResolutionRemotely Change-Id: I244dc2d83488e452d9690c0d7847c9ff15a95dbb --- libs/gui/ConsumerBase.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libs/gui/ConsumerBase.cpp') diff --git a/libs/gui/ConsumerBase.cpp b/libs/gui/ConsumerBase.cpp index c2b10a91dd..3d3637648c 100644 --- a/libs/gui/ConsumerBase.cpp +++ b/libs/gui/ConsumerBase.cpp @@ -106,7 +106,7 @@ void ConsumerBase::onFrameAvailable(const BufferItem& item) { sp listener; { // scope for the lock - Mutex::Autolock lock(mMutex); + Mutex::Autolock lock(mFrameAvailableMutex); listener = mFrameAvailableListener.promote(); } @@ -121,7 +121,7 @@ void ConsumerBase::onFrameReplaced(const BufferItem &item) { sp listener; { - Mutex::Autolock lock(mMutex); + Mutex::Autolock lock(mFrameAvailableMutex); listener = mFrameAvailableListener.promote(); } @@ -185,7 +185,7 @@ bool ConsumerBase::isAbandoned() { void ConsumerBase::setFrameAvailableListener( const wp& listener) { CB_LOGV("setFrameAvailableListener"); - Mutex::Autolock lock(mMutex); + Mutex::Autolock lock(mFrameAvailableMutex); mFrameAvailableListener = listener; } -- cgit v1.2.3-59-g8ed1b