Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eec3fca6 authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

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

Merge commit '7629e8dd' into gingerbread-plus-aosp

* commit '7629e8dd':
  Fix issue 2876124.
parents 3ce65633 7629e8dd

media/libmedia/mediaplayer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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;