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

Commit 8fe9840b authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am cac467b3: Merge "Fix one of the potential ANR issues from AwesomePlayer" into jb-dev 

* commit 'cac467b3':
  Fix one of the potential ANR issues from AwesomePlayer
parents 02bd2969 cac467b3

media/libstagefright/AwesomePlayer.cpp

+7 −1
Original line number Diff line number Diff line
@@ -2120,7 +2120,13 @@ status_t AwesomePlayer::finishSetDataSource_l() { 
        String8 mimeType;

        float confidence;

        sp<AMessage> dummy;

        bool success = SniffWVM(dataSource, &mimeType, &confidence, &dummy);

        bool success;



        // SniffWVM is potentially blocking since it may require network access.

        // Do not call it with mLock held.

        mLock.unlock();

        success = SniffWVM(dataSource, &mimeType, &confidence, &dummy);

        mLock.lock();



        if (!success

                || strcasecmp(