Camera: consider all cameras in flash light control

A non-API1 compatible camera might still has flash
unit and supports setTorchMode.

Test: partner testing
Change-Id: Ic8974afea13318624f35d17af4c4c238ee3fbf85
gugelfrei
Yin-Chia Yeh 6 years ago
parent 4eeaffe5ee
commit 98c72a87fc

@ -125,7 +125,7 @@ status_t CameraFlashlight::findFlashUnits() {
status_t res;
std::vector<String8> cameraIds;
std::vector<std::string> ids = mProviderManager->getAPI1CompatibleCameraDeviceIds();
std::vector<std::string> ids = mProviderManager->getCameraDeviceIds();
int numberOfCameras = static_cast<int>(ids.size());
cameraIds.resize(numberOfCameras);
// No module, must be provider
@ -217,7 +217,7 @@ status_t CameraFlashlight::prepareDeviceOpen(const String8& cameraId) {
if (mOpenedCameraIds.size() == 0) {
// notify torch unavailable for all cameras with a flash
std::vector<std::string> ids = mProviderManager->getAPI1CompatibleCameraDeviceIds();
std::vector<std::string> ids = mProviderManager->getCameraDeviceIds();
int numCameras = static_cast<int>(ids.size());
for (int i = 0; i < numCameras; i++) {
String8 id8(ids[i].c_str());
@ -263,7 +263,7 @@ status_t CameraFlashlight::deviceClosed(const String8& cameraId) {
if (isBackwardCompatibleMode(cameraId)) {
// notify torch available for all cameras with a flash
std::vector<std::string> ids = mProviderManager->getAPI1CompatibleCameraDeviceIds();
std::vector<std::string> ids = mProviderManager->getCameraDeviceIds();
int numCameras = static_cast<int>(ids.size());
for (int i = 0; i < numCameras; i++) {
String8 id8(ids[i].c_str());

Loading…
Cancel
Save