From 98c72a87fc004936c6c59b2f38311d6362d34bfe Mon Sep 17 00:00:00 2001 From: Yin-Chia Yeh Date: Tue, 28 Aug 2018 11:20:16 -0700 Subject: [PATCH] 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 --- services/camera/libcameraservice/CameraFlashlight.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/camera/libcameraservice/CameraFlashlight.cpp b/services/camera/libcameraservice/CameraFlashlight.cpp index 471c77db8e..e629cdd798 100644 --- a/services/camera/libcameraservice/CameraFlashlight.cpp +++ b/services/camera/libcameraservice/CameraFlashlight.cpp @@ -125,7 +125,7 @@ status_t CameraFlashlight::findFlashUnits() { status_t res; std::vector cameraIds; - std::vector ids = mProviderManager->getAPI1CompatibleCameraDeviceIds(); + std::vector ids = mProviderManager->getCameraDeviceIds(); int numberOfCameras = static_cast(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 ids = mProviderManager->getAPI1CompatibleCameraDeviceIds(); + std::vector ids = mProviderManager->getCameraDeviceIds(); int numCameras = static_cast(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 ids = mProviderManager->getAPI1CompatibleCameraDeviceIds(); + std::vector ids = mProviderManager->getCameraDeviceIds(); int numCameras = static_cast(ids.size()); for (int i = 0; i < numCameras; i++) { String8 id8(ids[i].c_str());