diff options
| author | Chong Zhang <chz@google.com> | 2014-10-24 18:53:44 -0700 |
|---|---|---|
| committer | Chong Zhang <chz@google.com> | 2014-10-27 22:22:57 +0000 |
| commit | df2592beab557663a471da2ac33ca463f7eee722 (patch) | |
| tree | 3cbf80d5599885efcc103c129c799349bb70790d /media | |
| parent | 31551f8dd625b8d40961e141d2913b0073f852ab (diff) | |
| download | frameworks_av-df2592beab557663a471da2ac33ca463f7eee722.zip frameworks_av-df2592beab557663a471da2ac33ca463f7eee722.tar.gz frameworks_av-df2592beab557663a471da2ac33ca463f7eee722.tar.bz2 | |
do not hold mNotifyLock when calling MediaPlayer::notify
Bug:18120688
Change-Id: Ia66dcfc3fd2d67d1ceba9808d21e0120cc8691d6
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 8eb1269..c120898 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -2159,7 +2159,6 @@ void MediaPlayerService::AudioCache::notify( { case MEDIA_ERROR: ALOGE("Error %d, %d occurred", ext1, ext2); - p->mError = ext1; break; case MEDIA_PREPARED: ALOGV("prepared"); @@ -2174,6 +2173,9 @@ void MediaPlayerService::AudioCache::notify( // wake up thread Mutex::Autolock lock(p->mLock); + if (msg == MEDIA_ERROR) { + p->mError = ext1; + } p->mCommandComplete = true; p->mSignal.signal(); } |