Merge "Camera: Correct torch support query" into tm-dev (95925459) · Commits · e / devices / smdk4412 / android_frameworks_av

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;
	}		}