commit 436f5bd0bcd8c23bb0efb1c3aedd6e497678e83c
author Wei Jia <wjia@google.com> Mon Mar 28 22:27:07 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 28 22:27:07 2016 +0000
tree 803058076f30009732c4d3d148266830c33e55c2
parent 1eca9c4ca0bd536230a447fa1e7b14acc138bd36
parent 2c96c0e35c7600c1112baa2cbebdf52f477c8880

Merge "MediaPlayer: use mLock to prevent racing condition." into nyc-dev
am: 2c96c0e

* commit '2c96c0e35c7600c1112baa2cbebdf52f477c8880':
  MediaPlayer: use mLock to prevent racing condition.

media/libmedia/mediaplayer.cpp

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;
     }