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

Commit c43464ea authored by Wei Jia's avatar Wei Jia
Browse files

GenericSource: restore mLock state in error cases 

initFromDataSource and onPrepareAsync are called with mLock acquired.
When initFromDataSource returns with error, notifyPreparedAndCleanup
will be called and it requires mLock acquired.

Test: cts
Bug: 122564587
Change-Id: I430dbc5f1f30c06223ea22438282bd388174f7df
parent 18c84ba4

media/libmediaplayerservice/nuplayer/GenericSource.cpp

+2 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ status_t NuPlayer::GenericSource::initFromDataSource() { 


    if (extractor == NULL) {

        ALOGE("initFromDataSource, cannot create extractor!");

        mLock.lock();

        return UNKNOWN_ERROR;

    }
@@ -179,6 +180,7 @@ status_t NuPlayer::GenericSource::initFromDataSource() { 
    size_t numtracks = extractor->countTracks();

    if (numtracks == 0) {

        ALOGE("initFromDataSource, source has no track!");

        mLock.lock();

        return UNKNOWN_ERROR;

    }