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

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

Merge "Camera: Correct torch support query" into tm-dev am: 95925459 

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



Change-Id: I66a7eb2eee0ffd3c2ea6293a6c7c03bb0e917d4f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0dd6b4d2 95925459

services/camera/libcameraservice/common/CameraProviderManager.cpp

+4 −3
Original line number Original line Diff line number Diff line
@@ -437,11 +437,12 @@ int32_t CameraProviderManager::getTorchDefaultStrengthLevel(const std::string &i 
bool CameraProviderManager::supportSetTorchMode(const std::string &id) const {

bool CameraProviderManager::supportSetTorchMode(const std::string &id) const {

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

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

    for (auto& provider : mProviders) {

    for (auto& provider : mProviders) {

        auto deviceInfo = findDeviceInfoLocked(id);

        for (auto& deviceInfo : provider->mDevices) {

        if (deviceInfo != nullptr) {

            if (deviceInfo->mId == id) {

                return provider->mSetTorchModeSupported;

                return provider->mSetTorchModeSupported;

            }

            }

        }

        }

    }

    return false;

    return false;

}

}