Merge "Camera: Correct torch support query" into tm-dev
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
index 61abcb0..abaea66 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -437,9 +437,10 @@
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) {
- return provider->mSetTorchModeSupported;
+ for (auto& deviceInfo : provider->mDevices) {
+ if (deviceInfo->mId == id) {
+ return provider->mSetTorchModeSupported;
+ }
}
}
return false;