commit e4d3e1f41e37936450a852b24d18c15ba7951dc7
author Rucha Katakwar <ruchamk@google.com> Mon Nov 06 13:46:45 2023 -0800
committer Rucha Katakwar <ruchamk@google.com> Mon Nov 06 13:52:33 2023 -0800
tree 2e00914de91d230498be67f16978de07824e6748
parent e4f0d2c54e2e00521b91dfe78d92dabdbd373a4a

Camera: Fix up flash strength control keys

Fix up manual flash strength control keys for physical cameras.

Bug: 308758021
Test: Tested android.hardware.camera2.cts.LogicalCameraDeviceTest
Change-Id: Iee558c2379b0dc55b9bd9cfc8bf36ebcc668e00e

services/camera/libcameraservice/common/CameraProviderManager.cpp

diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
index 937d755..3801470 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -1490,13 +1490,14 @@
     return res;
 }
 
-status_t CameraProviderManager::ProviderInfo::DeviceInfo3::fixupManualFlashStrengthControlTags() {
+
+status_t CameraProviderManager::ProviderInfo::DeviceInfo3::fixupManualFlashStrengthControlTags(
+            CameraMetadata& ch) {
     status_t res = OK;
-    auto& c = mCameraCharacteristics;
-    auto flashSingleStrengthMaxLevelEntry = c.find(ANDROID_FLASH_SINGLE_STRENGTH_MAX_LEVEL);
+    auto flashSingleStrengthMaxLevelEntry = ch.find(ANDROID_FLASH_SINGLE_STRENGTH_MAX_LEVEL);
     if (flashSingleStrengthMaxLevelEntry.count == 0) {
         int32_t flashSingleStrengthMaxLevel = 1;
-        res = c.update(ANDROID_FLASH_SINGLE_STRENGTH_MAX_LEVEL,
+        res = ch.update(ANDROID_FLASH_SINGLE_STRENGTH_MAX_LEVEL,
                 &flashSingleStrengthMaxLevel, 1);
         if (res != OK) {
             ALOGE("%s: Failed to update ANDROID_FLASH_SINGLE_STRENGTH_MAX_LEVEL: %s (%d)",
@@ -1504,10 +1505,11 @@
             return res;
         }
     }
-    auto flashSingleStrengthDefaultLevelEntry = c.find(ANDROID_FLASH_SINGLE_STRENGTH_DEFAULT_LEVEL);
+    auto flashSingleStrengthDefaultLevelEntry = ch.find(
+            ANDROID_FLASH_SINGLE_STRENGTH_DEFAULT_LEVEL);
     if (flashSingleStrengthDefaultLevelEntry.count == 0) {
         int32_t flashSingleStrengthDefaultLevel = 1;
-        res = c.update(ANDROID_FLASH_SINGLE_STRENGTH_DEFAULT_LEVEL,
+        res = ch.update(ANDROID_FLASH_SINGLE_STRENGTH_DEFAULT_LEVEL,
                 &flashSingleStrengthDefaultLevel, 1);
         if (res != OK) {
             ALOGE("%s: Failed to update ANDROID_FLASH_SINGLE_STRENGTH_DEFAULT_LEVEL: %s (%d)",
@@ -1515,10 +1517,10 @@
             return res;
         }
     }
-    auto flashTorchStrengthMaxLevelEntry = c.find(ANDROID_FLASH_TORCH_STRENGTH_MAX_LEVEL);
+    auto flashTorchStrengthMaxLevelEntry = ch.find(ANDROID_FLASH_TORCH_STRENGTH_MAX_LEVEL);
     if (flashTorchStrengthMaxLevelEntry.count == 0) {
         int32_t flashTorchStrengthMaxLevel = 1;
-        res = c.update(ANDROID_FLASH_TORCH_STRENGTH_MAX_LEVEL,
+        res = ch.update(ANDROID_FLASH_TORCH_STRENGTH_MAX_LEVEL,
                 &flashTorchStrengthMaxLevel, 1);
         if (res != OK) {
             ALOGE("%s: Failed to update ANDROID_FLASH_TORCH_STRENGTH_MAX_LEVEL: %s (%d)",
@@ -1526,10 +1528,10 @@
             return res;
         }
     }
-    auto flashTorchStrengthDefaultLevelEntry = c.find(ANDROID_FLASH_TORCH_STRENGTH_DEFAULT_LEVEL);
+    auto flashTorchStrengthDefaultLevelEntry = ch.find(ANDROID_FLASH_TORCH_STRENGTH_DEFAULT_LEVEL);
     if (flashTorchStrengthDefaultLevelEntry.count == 0) {
         int32_t flashTorchStrengthDefaultLevel = 1;
-        res = c.update(ANDROID_FLASH_TORCH_STRENGTH_DEFAULT_LEVEL,
+        res = ch.update(ANDROID_FLASH_TORCH_STRENGTH_DEFAULT_LEVEL,
                 &flashTorchStrengthDefaultLevel, 1);
         if (res != OK) {
             ALOGE("%s: Failed to update ANDROID_FLASH_TORCH_STRENGTH_DEFAULT_LEVEL: %s (%d)",