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

Commit c4f36438 authored by Dichen Zhang's avatar Dichen Zhang Committed by android-build-merger
Browse files

Merge "fix bug: release mDisconnectLock when early terminate" into qt-dev am:... 

Merge "fix bug: release mDisconnectLock when early terminate" into qt-dev am: c5bfbeaf am: 85b23e26
am: 37133d63

Change-Id: I90810b1e8d592339cb1faec680ff6d2f3c0f3a63
parents 1735381e 37133d63

media/libmediaplayerservice/nuplayer/GenericSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -389,7 +389,6 @@ void NuPlayer::GenericSource::onPrepareAsync() { 
                if (httpSource == NULL) {

                    ALOGE("Failed to create http source!");

                    notifyPreparedAndCleanup(UNKNOWN_ERROR);

                    mDisconnectLock.lock();

                    return;

                }

                mDisconnectLock.lock();
@@ -449,6 +448,7 @@ void NuPlayer::GenericSource::onPrepareAsync() { 


        if (mDataSource == NULL) {

            ALOGE("Failed to create data source!");

            mDisconnectLock.unlock();

            notifyPreparedAndCleanup(UNKNOWN_ERROR);

            return;

        }