Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7629e8dd: Merge "Fix issue 2876124." into gingerbread

Browse Source 
Merge commit '7629e8dd1426a8a8e38a82e13eb51d1c6af24f36' into gingerbread-plus-aosp

* commit '7629e8dd1426a8a8e38a82e13eb51d1c6af24f36':
  Fix issue 2876124.
This commit is contained in:
Eric Laurent
2010-08-04 10:07:24 -07:00
committed by Android Git Automerger
parent 3ce6563320 7629e8dd14
commit eec3fca627
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/libmedia/mediaplayer.cpp
View File

@@ -568,7 +568,8 @@ void MediaPlayer::notify(int msg, int ext1, int ext2)
locked = true; 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); LOGV("notify(%d, %d, %d) callback on disconnected mediaplayer", msg, ext1, ext2);
if (locked) mLock.unlock(); // release the lock when done. if (locked) mLock.unlock(); // release the lock when done.
return; return;