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

Commit 30dec712 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Automerger Merge Worker
Browse files

Camera: Fix race condition between initialize and statusCallback am: 4208ea0d am: 2391aabd 

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

Change-Id: I9fbec34526a39132fb2ebc9de65feddfb4df2159
parents e46c8f51 2391aabd

services/camera/libcameraservice/common/CameraProviderManager.cpp

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