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

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

Merge "NuPlayer::GenericSource::onPrepareAsync():Change lock order mLock and... 

Merge "NuPlayer::GenericSource::onPrepareAsync():Change lock order mLock and mDisconnect lock order interleaving, which has potential risk of deadlock if other code locks/unlocks them in a different order." into qt-dev am: c6ad7d76 am: 1d2eb44e
am: 5f3ca1c9

Change-Id: Ia050d58b5b93a6375b0b17a1000d245789ec8cf6
parents d575d3a5 5f3ca1c9

media/libmediaplayerservice/nuplayer/GenericSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -404,8 +404,8 @@ void NuPlayer::GenericSource::onPrepareAsync() { 
            sp<DataSource> dataSource = DataSourceFactory::CreateFromURI(

                   mHTTPService, uri, &mUriHeaders, &contentType,

                   static_cast<HTTPBase *>(mHttpSource.get()));

            mLock.lock();

            mDisconnectLock.lock();

            mLock.lock();

            if (!mDisconnected) {

                mDataSource = dataSource;

            }