Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8ef2d30 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Camera: Fix race condition between initialize and... 

Merge "Revert "Camera: Fix race condition between initialize and statusCallback"" into rvc-qpr-dev am: c4ba40d4 am: f4767316

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12215422

Change-Id: I5a722654a5a48ee65fcc99fde6d21fb41617fada
parents 04698a34 f4767316

services/camera/libcameraservice/common/CameraProviderManager.cpp

+0 −1
Original line number Diff line number Diff line
@@ -1272,7 +1272,6 @@ CameraProviderManager::ProviderInfo::ProviderInfo( 
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__);