commit c4270cc3a9287d72163cacd0cadfa91523764855
author Dichen Zhang <dichenzhang@google.com> Thu Jun 13 11:32:07 2019 -0700
committer Dichen Zhang <dichenzhang@google.com> Thu Jun 13 21:07:39 2019 +0000
tree 7c0e353320c0bd5120199167a1630e23db4eff3d
parent e81a326d90dfce1249917b796f69b48fe1c59971

fix bug: release mDisconnectLock when early terminate

Bug: 134995545
Tests: (1) described in buganizer comment #2
       (2) atest CtsCameraTestCases:android.hardware.camera2.cts.FastBasicsTest#testCamera1
Change-Id: Ie134e503cd7602a754b57bcc5c1355dea19d4eab

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;
         }