summaryrefslogtreecommitdiff
path: root/libs/gui/BLASTBufferQueue.cpp
diff options
context:
space:
mode:
author Alec Mouri <alecmouri@google.com> 2021-08-31 22:39:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-08-31 22:39:18 +0000
commit12b8cad1e777bb651a6b0904049437adb0a79d31 (patch)
tree0291e54b7c61b8950df3714a20dcd06a72b3d9ae /libs/gui/BLASTBufferQueue.cpp
parentd68bf7b113faa5ad0cd82d31cb56bac8571a32ce (diff)
parent618f49adede8ea3a63fe9633499eb03ce3f8da4e (diff)
Use a separate mutex for BLASTBufferQueue in BLASTBufferItemConsumer am: 5c8b18c908 am: 618f49aded
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15728802 Change-Id: Ib73e662e1912f99abe692f0e32b133947174b7bf
Diffstat (limited to 'libs/gui/BLASTBufferQueue.cpp')
-rw-r--r--libs/gui/BLASTBufferQueue.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/gui/BLASTBufferQueue.cpp b/libs/gui/BLASTBufferQueue.cpp
index 70f2ae770b..e5a2151f13 100644
--- a/libs/gui/BLASTBufferQueue.cpp
+++ b/libs/gui/BLASTBufferQueue.cpp
@@ -118,12 +118,12 @@ void BLASTBufferItemConsumer::getConnectionEvents(uint64_t frameNumber, bool* ne
}
void BLASTBufferItemConsumer::setBlastBufferQueue(BLASTBufferQueue* blastbufferqueue) {
- Mutex::Autolock lock(mMutex);
+ std::scoped_lock lock(mBufferQueueMutex);
mBLASTBufferQueue = blastbufferqueue;
}
void BLASTBufferItemConsumer::onSidebandStreamChanged() {
- Mutex::Autolock lock(mMutex);
+ std::scoped_lock lock(mBufferQueueMutex);
if (mBLASTBufferQueue != nullptr) {
sp<NativeHandle> stream = getSidebandStream();
mBLASTBufferQueue->setSidebandStream(stream);