commit 932f63ef1219deb522f094c4cf8f1223a7fb38c2
author Dichen Zhang <dichenzhang@google.com> Thu Jun 13 17:40:32 2019 -0700
committer Dichen Zhang <dichenzhang@google.com> Tue Jun 18 18:15:25 2019 +0000
tree e1a77b364eda64fb5faa4b62d42447a4f1e34a37
parent c5bfbeaf974e50bf5d840186a7000d75ce9db25a

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.

Bug: 135211710
Test: (1) android.hardware.camera2.cts.FastBasicsTest#testCamera1
      (2) android.media.cts.MediaPlayerFlakyNetworkTest

Change-Id: I9486f2c6780c2f246786299a3d6c7c2f7295b768

media/libmediaplayerservice/nuplayer/GenericSource.cpp

diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index 0f72c0d..2cd920a 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -404,8 +404,8 @@
             sp<DataSource> dataSource = DataSourceFactory::CreateFromURI(
                    mHTTPService, uri, &mUriHeaders, &contentType,
                    static_cast<HTTPBase *>(mHttpSource.get()));
-            mLock.lock();
             mDisconnectLock.lock();
+            mLock.lock();
             if (!mDisconnected) {
                 mDataSource = dataSource;
             }