| commit | b8ef2d30c4de0b2e8a1df4718aa9eb44a8ea936c | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jul 23 20:23:38 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 23 20:23:38 2020 +0000 |
| tree | 92bad2264e12191996458e97fc5d0e6b26bbdeb2 | |
| parent | 04698a346d637e4db1fc400b102f04fdfa9b5835 [diff] | |
| parent | f47673163da004b673144916121db0363862782e [diff] |
Merge "Revert "Camera: Fix race condition between initialize and statusCallback"" into rvc-qpr-dev am: c4ba40d49f am: f47673163d Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12215422 Change-Id: I5a722654a5a48ee65fcc99fde6d21fb41617fada
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp index 1973711..d11d470 100644 --- a/services/camera/libcameraservice/common/CameraProviderManager.cpp +++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -1272,7 +1272,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__);