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

Commit 07feed43 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [8013357, 8013329, 8013654, 8013655, 8013656, 8013657,... 

Merge cherrypicks of [8013357, 8013329, 8013654, 8013655, 8013656, 8013657, 8013958, 8013959, 8013960, 8013978] into qt-c2f2-release

Change-Id: Icc07f3a39b59944a2c708228a2fe439cd919dad2
parents 6a68ac51 c852ca3c

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;

        }