summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Hung <hunga@google.com>2014-11-18 20:18:25 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-18 20:18:25 +0000
commit44ce5407e8b582a37431464322d92c6bc3cc732a (patch)
tree26eee98621d277b332ac7930b530687a4ee0295e
parentc1d3818b2f63731e38083b3d2dea62a3b295f200 (diff)
parent932ab10f1a466c2e6d655c05edf3d8cfecea850a (diff)
downloadframeworks_av-44ce5407e8b582a37431464322d92c6bc3cc732a.zip
frameworks_av-44ce5407e8b582a37431464322d92c6bc3cc732a.tar.gz
frameworks_av-44ce5407e8b582a37431464322d92c6bc3cc732a.tar.bz2
am 932ab10f: am 1c764234: am 88ec9e99: Merge "Fix race condition in signaling completion for decode." into lmp-mr1-dev
* commit '932ab10f1a466c2e6d655c05edf3d8cfecea850a': Fix race condition in signaling completion for decode.
-rw-r--r--media/libmediaplayerservice/MediaPlayerService.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index cd5478a..071b894 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -2124,6 +2124,7 @@ ssize_t MediaPlayerService::AudioCache::write(const void* buffer, size_t size)
// immutable with respect to future writes.
//
// It is thus safe for another thread to read the AudioCache.
+ Mutex::Autolock lock(mLock);
mCommandComplete = true;
mSignal.signal();
}