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

Commit f284c53e authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6703926 from c4ba40d4 to rvc-qpr1-release 

Change-Id: I5c3cbb2be9241aec24295b5ce8ac34ed46825adc
parents 377a8632 c4ba40d4

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__);