commit 66cddecf70d44068fb61d0a14920ad3cbe8231fb
author Shuzhen Wang <shuzhenwang@google.com> Thu Jul 23 00:41:46 2020 +0000
committer Shuzhen Wang <shuzhenwang@google.com> Thu Jul 23 00:41:46 2020 +0000
tree 4c39f75ee54b45f4d26fe65facfad438aad0f20d
parent 4208ea0d5fb7297f9cec44238e388ce536f36334

Revert "Camera: Fix race condition between initialize and statusCallback"

This reverts commit 4208ea0d5fb7297f9cec44238e388ce536f36334.

Reason for revert: Result in single-thread deadlock

Bug: 161765178
Change-Id: I8fa508be68746cfe2bbfee70463192e0c478bc33

services/camera/libcameraservice/common/CameraProviderManager.cpp

diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
index c391002..32d118d 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -1312,7 +1312,6 @@
 status_t CameraProviderManager::ProviderInfo::initialize(
         sp<provider::V2_4::ICameraProvider>& interface,
         hardware::hidl_bitfield<provider::V2_5::DeviceState> currentDeviceState) {
-    std::lock_guard<std::mutex> lock(mLock);
     status_t res = parseProviderName(mProviderName, &mType, &mId);
     if (res != OK) {
         ALOGE("%s: Invalid provider name, ignoring", __FUNCTION__);