| commit | 2c96c0e35c7600c1112baa2cbebdf52f477c8880 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Mon Mar 28 22:25:35 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Mar 28 22:25:35 2016 +0000 |
| tree | 0c0dff6efd1da66e4e4a504a33705921c1cc3351 | |
| parent | fd7dc4c764e6ec1136439188f75839094ff01917 [diff] | |
| parent | 1243869fb29ee580fa5c179443420c06a779dbfd [diff] |
Merge "MediaPlayer: use mLock to prevent racing condition." into nyc-dev
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index 25c9fb1..2795101 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp
@@ -907,6 +907,7 @@ } status_t MediaPlayer::setNextMediaPlayer(const sp<MediaPlayer>& next) { + Mutex::Autolock _l(mLock); if (mPlayer == NULL) { return NO_INIT; }