diff options
| author | Eric Laurent <elaurent@google.com> | 2010-08-05 11:43:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-05 11:43:45 -0700 |
| commit | aa68b49a53a874a1813e65752663f19d18149e2c (patch) | |
| tree | b906d41ef13bdcb8ca79b6aee5d7458fcc273e33 /media/libmedia | |
| parent | 154898f4e6e3f898eacfd699a45f611b0c1b7c9a (diff) | |
| parent | b9ad87ca9a18e28436e8634e95d9715b32b07faf (diff) | |
| download | frameworks_av-aa68b49a53a874a1813e65752663f19d18149e2c.zip frameworks_av-aa68b49a53a874a1813e65752663f19d18149e2c.tar.gz frameworks_av-aa68b49a53a874a1813e65752663f19d18149e2c.tar.bz2 | |
am eec3fca6: am 7629e8dd: Merge "Fix issue 2876124." into gingerbread
Merge commit 'eec3fca6277296f354ee2b1af0f4b3dceddb3067'
* commit 'eec3fca6277296f354ee2b1af0f4b3dceddb3067':
Fix issue 2876124.
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/mediaplayer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index 1c99ae5..f3229c0 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -568,7 +568,8 @@ void MediaPlayer::notify(int msg, int ext1, int ext2) locked = true; } - if (mPlayer == 0) { + // Allows calls from JNI in idle state to notify errors + if (!(msg == MEDIA_ERROR && mCurrentState == MEDIA_PLAYER_IDLE) && mPlayer == 0) { LOGV("notify(%d, %d, %d) callback on disconnected mediaplayer", msg, ext1, ext2); if (locked) mLock.unlock(); // release the lock when done. return; |