| commit | 01a9f0422a202a925e4cea3bfeac4bfc9a05a553 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Mon Mar 28 23:16:05 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Mar 28 23:16:06 2016 +0000 |
| tree | d00c74db1af3f9c0963f1a63942dfc4f8179e0d7 | |
| parent | bbc96beb74c771f392d1325e83d8bd2b0b508b7d [diff] | |
| parent | b06d2bd788a8858413875c39f25cbe778e90f8ad [diff] |
Merge "MediaPlayer: use mLock to prevent racing condition."
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index 502ab2d..faf2339 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp
@@ -922,6 +922,7 @@ } status_t MediaPlayer::setNextMediaPlayer(const sp<MediaPlayer>& next) { + Mutex::Autolock _l(mLock); if (mPlayer == NULL) { return NO_INIT; }