diff options
| author | Wei Jia <wjia@google.com> | 2015-10-06 10:32:32 -0700 |
|---|---|---|
| committer | Wei Jia <wjia@google.com> | 2015-10-13 21:28:58 +0000 |
| commit | 842396584c80d352c9aa7ea249399102155df49b (patch) | |
| tree | 1cfafa590ef0cb2a1af420608bd7fc6c3bc8c9f9 | |
| parent | e5200ea76c5d180b53087ae7825326ec61cc4687 (diff) | |
| download | frameworks_av-842396584c80d352c9aa7ea249399102155df49b.zip frameworks_av-842396584c80d352c9aa7ea249399102155df49b.tar.gz frameworks_av-842396584c80d352c9aa7ea249399102155df49b.tar.bz2 | |
NuPlayerDriver: acquire mLock when needed.
Bug: 24338126
Change-Id: Ic55d1a551c18255423423079b6c2bf045dea6e44
(cherry picked from commit f3631d2921ee0738f87427848e38873370ef9ec0)
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp index 7370224..478d310 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp @@ -362,9 +362,9 @@ bool NuPlayerDriver::isPlaying() { } status_t NuPlayerDriver::setPlaybackSettings(const AudioPlaybackRate &rate) { - Mutex::Autolock autoLock(mLock); status_t err = mPlayer->setPlaybackSettings(rate); if (err == OK) { + Mutex::Autolock autoLock(mLock); if (rate.mSpeed == 0.f && mState == STATE_RUNNING) { mState = STATE_PAUSED; // try to update position |