GenericSource: acquire lock only for assigning dataSource.

Acquire lock after DataSource::CreateFromURI() to avoid a deadlock/ANR
as GenericSource::disconnect() also tries to acquire same lock.

Change-Id: I28430800853ed11e0a37a8a38defab72470c3f6d

1 files changed, 7 insertions, 3 deletions

diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index 1e8c2d3..2341817 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -393,16 +393,20 @@ void NuPlayer::GenericSource::onPrepareAsync() {
                 }
             }
 
-            Mutex::Autolock _l(mSourceLock);
-            mDataSource = DataSource::CreateFromURI(
+            sp<DataSource> dataSource;
+            dataSource = DataSource::CreateFromURI(
                    mHTTPService, uri, &mUriHeaders, &contentType,
                    static_cast<HTTPBase *>(mHttpSource.get()),
                    true /*use extended cache*/);
+            Mutex::Autolock _l(mSourceLock);
+            mDataSource = dataSource;
         } else {
             mIsWidevine = false;
 
+            sp<DataSource> dataSource;
+            dataSource = new FileSource(mFd, mOffset, mLength);
             Mutex::Autolock _l(mSourceLock);
-            mDataSource = new FileSource(mFd, mOffset, mLength);
+            mDataSource = dataSource;
             mFd = -1;
         }