commit a072ad99fd91aebe9b7a99c639f04906b5cc7cf2
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Sep 28 09:30:34 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 28 09:30:34 2018 +0000
tree 95fb5a85a7e78ed1a30397d2d7d634ddf73dd0da
parent f2967429f401a91c9318233cce77005ac3ecc12d
parent 2843c36c64a050adeb3a6c187aed611d991b97cd

Merge "Camera: Limit the scope 'mTrackerLock' within 'disconnectImpl'"

services/camera/libcameraservice/device3/Camera3Device.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index 786fd7f..48e38bb 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -281,7 +281,6 @@
 status_t Camera3Device::disconnectImpl() {
     ATRACE_CALL();
     Mutex::Autolock il(mInterfaceLock);
-    Mutex::Autolock stLock(mTrackerLock);
 
     ALOGI("%s: E", __FUNCTION__);
 
@@ -346,6 +345,7 @@
     {
         Mutex::Autolock l(mLock);
         mRequestThread.clear();
+        Mutex::Autolock stLock(mTrackerLock);
         mStatusTracker.clear();
         interface = mInterface.get();
     }