commit c5bfbeaf974e50bf5d840186a7000d75ce9db25a
author Dichen Zhang <dichenzhang@google.com> Fri Jun 14 00:18:46 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 14 00:18:46 2019 +0000
tree 7bc868b317e61a6ef494adaa0416057e27fed88a
parent e1163459035a6cac598a891b49a9081192a3c0cd
parent c4270cc3a9287d72163cacd0cadfa91523764855

Merge "fix bug: release mDisconnectLock when early terminate" into qt-dev

media/libmediaplayerservice/nuplayer/GenericSource.cpp

diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index 5c77e41..0f72c0d 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -389,7 +389,6 @@
                 if (httpSource == NULL) {
                     ALOGE("Failed to create http source!");
                     notifyPreparedAndCleanup(UNKNOWN_ERROR);
-                    mDisconnectLock.lock();
                     return;
                 }
                 mDisconnectLock.lock();
@@ -449,6 +448,7 @@
 
         if (mDataSource == NULL) {
             ALOGE("Failed to create data source!");
+            mDisconnectLock.unlock();
             notifyPreparedAndCleanup(UNKNOWN_ERROR);
             return;
         }