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

Commit 8da2650d authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "MEDIA_PLAYER_STATE_ERROR is not a bitmask (b/2502881)"

parents 9ceaf70e e44b41ba

media/libmedia/mediaplayer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -104,7 +104,8 @@ status_t MediaPlayer::setDataSource(const sp<IMediaPlayer>& player) 
    { // scope for the lock

        Mutex::Autolock _l(mLock);



        if ( !( mCurrentState & ( MEDIA_PLAYER_IDLE | MEDIA_PLAYER_STATE_ERROR ) ) ) {

        if ( !( (mCurrentState & MEDIA_PLAYER_IDLE) ||

                (mCurrentState == MEDIA_PLAYER_STATE_ERROR ) ) ) {

            LOGE("setDataSource called in state %d", mCurrentState);

            return INVALID_OPERATION;

        }