summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-02-11 22:46:54 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-02-11 22:46:54 +0100
commit77561dae684892fc6977216621cb72b7be8bf64e (patch)
tree8252394f113abc94c155b346374467960bc5006d
parentc159da765bfeed47ca45ac0645d98de303b56def (diff)
parent65166fe47da62447310b67303ab9db9e5820178c (diff)
downloadframeworks_native-replicant-6.0.zip
frameworks_native-replicant-6.0.tar.gz
frameworks_native-replicant-6.0.tar.bz2
Merge branch 'cm-13.0' of https://github.com/LineageOS/android_frameworks_native into replicant-6.0replicant-6.0-beta-0002replicant-6.0
-rw-r--r--libs/gui/BufferQueueConsumer.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/gui/BufferQueueConsumer.cpp b/libs/gui/BufferQueueConsumer.cpp
index 7504ed4..7aea4bb 100644
--- a/libs/gui/BufferQueueConsumer.cpp
+++ b/libs/gui/BufferQueueConsumer.cpp
@@ -572,6 +572,7 @@ status_t BufferQueueConsumer::setTransformHint(uint32_t hint) {
}
sp<NativeHandle> BufferQueueConsumer::getSidebandStream() const {
+ Mutex::Autolock lock(mCore->mMutex);
return mCore->mSidebandStream;
}