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

6 years ago · a072ad99fd
parent f2967429f4 2843c36c64
commit a072ad99fd
1 changed files with 1 additions and 1 deletions
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@ -281,7 +281,6 @@ status_t Camera3Device::disconnect() {
 status_t Camera3Device::disconnectImpl() {
    ATRACE_CALL();
    Mutex::Autolock il(mInterfaceLock);
-    Mutex::Autolock stLock(mTrackerLock);

    ALOGI("%s: E", __FUNCTION__);

@ -346,6 +345,7 @@ status_t Camera3Device::disconnectImpl() {
    {
        Mutex::Autolock l(mLock);
        mRequestThread.clear();
+        Mutex::Autolock stLock(mTrackerLock);
        mStatusTracker.clear();
        interface = mInterface.get();
    }