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

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

Merge "Reject unprepared MediaPlayers"

parents 743649fa b13820ff

media/libmedia/mediaplayer.cpp

+7 −0
Original line number Diff line number Diff line
@@ -811,6 +811,13 @@ status_t MediaPlayer::setNextMediaPlayer(const sp<MediaPlayer>& next) { 
    if (mPlayer == NULL) {

        return NO_INIT;

    }



    if (next != NULL && !(next->mCurrentState &

            (MEDIA_PLAYER_PREPARED | MEDIA_PLAYER_PAUSED | MEDIA_PLAYER_PLAYBACK_COMPLETE))) {

        ALOGE("next player is not prepared");

        return INVALID_OPERATION;

    }



    return mPlayer->setNextPlayer(next == NULL ? NULL : next->mPlayer);

}