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

Commit 66cddecf authored by Shuzhen Wang's avatar Shuzhen Wang
Browse files

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

This reverts commit 4208ea0d.

Reason for revert: Result in single-thread deadlock

Bug: 161765178
Change-Id: I8fa508be68746cfe2bbfee70463192e0c478bc33
parent 4208ea0d

services/camera/libcameraservice/common/CameraProviderManager.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -1312,7 +1312,6 @@ CameraProviderManager::ProviderInfo::ProviderInfo( 
status_t CameraProviderManager::ProviderInfo::initialize(

status_t CameraProviderManager::ProviderInfo::initialize(

        sp<provider::V2_4::ICameraProvider>& interface,

        sp<provider::V2_4::ICameraProvider>& interface,

        hardware::hidl_bitfield<provider::V2_5::DeviceState> currentDeviceState) {

        hardware::hidl_bitfield<provider::V2_5::DeviceState> currentDeviceState) {

    std::lock_guard<std::mutex> lock(mLock);

    status_t res = parseProviderName(mProviderName, &mType, &mId);

    status_t res = parseProviderName(mProviderName, &mType, &mId);

    if (res != OK) {

    if (res != OK) {

        ALOGE("%s: Invalid provider name, ignoring", __FUNCTION__);

        ALOGE("%s: Invalid provider name, ignoring", __FUNCTION__);