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

Commit fa490f42 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Merge "Merge "Camera: Correct torch support query" into tm-dev am: 95925459 am: 42498a76 am: 2f36a61c" into tm-qpr-dev-plus-aosp am: 0c1b69ef

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



Change-Id: Ide9dfc274e7212887273656e81181b0fe6c7813d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7a4d2ad7 0c1b69ef

services/camera/libcameraservice/common/CameraProviderManager.cpp

+4 −3
Original line number 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 {

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

    for (auto& provider : mProviders) {

        auto deviceInfo = findDeviceInfoLocked(id);

        if (deviceInfo != nullptr) {

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

            if (deviceInfo->mId == id) {

                return provider->mSetTorchModeSupported;

            }

        }

    }

    return false;

}