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

Commit 548b9920 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 2d9f3169: Merge change 5595 into donut 

Merge commit '2d9f3169'

* commit '2d9f3169':
  We might try to close the Vorbis file twice under certain
parents b8990f39 2d9f3169

media/libmediaplayerservice/VorbisPlayer.cpp

+6 −6
Original line number Diff line number Diff line
@@ -345,9 +345,6 @@ status_t VorbisPlayer::reset() 
{

    LOGV("reset\n");

    Mutex::Autolock l(mMutex);

    if (mState != STATE_OPEN) {

        return NO_ERROR;

    }

    return reset_nosync();

}
@@ -355,10 +352,13 @@ status_t VorbisPlayer::reset() 
status_t VorbisPlayer::reset_nosync()

{

    // close file

    if (mFile != NULL) {

        ov_clear(&mVorbisFile); // this also closes the FILE

        if (mFile != NULL) {

            LOGV("OOPS! Vorbis didn't close the file");

            fclose(mFile);

            mFile = NULL;

        }

    }

    mState = STATE_ERROR;