diff options
author | Andy Hung <hunga@google.com> | 2014-11-17 23:34:30 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-17 23:34:31 +0000 |
commit | 88ec9e992af75f9783794df5d7be31c3b018ad09 (patch) | |
tree | 4a8fc2f6d544aa9bb971d06b7a8a3d48021c5b12 | |
parent | 39b109a1df23e7610b031b466e9ecf510b3c077f (diff) | |
parent | b51457f8d915e0ed8edf66d1d2c263ab4a792be8 (diff) | |
download | frameworks_av-88ec9e992af75f9783794df5d7be31c3b018ad09.zip frameworks_av-88ec9e992af75f9783794df5d7be31c3b018ad09.tar.gz frameworks_av-88ec9e992af75f9783794df5d7be31c3b018ad09.tar.bz2 |
Merge "Fix race condition in signaling completion for decode." into lmp-mr1-dev
-rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index c120898..d461af3 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -2125,6 +2125,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(); } |