commit bda6bce292d96a86c07a838375fdf64bbc98212c
author Ranjith Kagathi Ananda <ranjith@codeaurora.org> Tue Apr 19 18:39:48 2016 -0700
committer Zhijun He <zhijunhe@google.com> Mon May 09 19:31:51 2016 -0700
tree dee23e6765725eac95a67521be6e64b0206fb5b8
parent abd7f8c582d14290e74a9418cf38a9350f82159c

QCamera2/HAL3: Add dynamic black and white level conditionally

As per the new HAL3 spec, dynamic black and white level tags
should be added to available result keys only if optical
black regions is supported on a given device.

CRs-Fixed: 998824
BUG=28276885

Change-Id: I862372620846bf5154e8084394a22b49d96ec03c

QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/QCamera2/HAL3/QCamera3HWI.cpp b/QCamera2/HAL3/QCamera3HWI.cpp
index ff3272a..34b01d4 100755
--- a/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/QCamera2/HAL3/QCamera3HWI.cpp
@@ -7078,8 +7078,6 @@
        ANDROID_STATISTICS_PREDICTED_COLOR_GAINS, ANDROID_STATISTICS_PREDICTED_COLOR_TRANSFORM,
        ANDROID_STATISTICS_SCENE_FLICKER, ANDROID_STATISTICS_FACE_RECTANGLES,
        ANDROID_STATISTICS_FACE_SCORES,
-       ANDROID_SENSOR_DYNAMIC_BLACK_LEVEL,
-       ANDROID_SENSOR_DYNAMIC_WHITE_LEVEL, NEXUS_EXPERIMENTAL_2016_HYBRID_AE_ENABLE,
        ANDROID_CONTROL_POST_RAW_SENSITIVITY_BOOST };
     size_t result_keys_cnt =
             sizeof(result_keys_basic)/sizeof(result_keys_basic[0]);
@@ -7101,6 +7099,10 @@
         available_result_keys.add(ANDROID_STATISTICS_FACE_IDS);
         available_result_keys.add(ANDROID_STATISTICS_FACE_LANDMARKS);
     }
+    if (hasBlackRegions) {
+        available_result_keys.add(ANDROID_SENSOR_DYNAMIC_BLACK_LEVEL);
+        available_result_keys.add(ANDROID_SENSOR_DYNAMIC_WHITE_LEVEL);
+    }
     staticInfo.update(ANDROID_REQUEST_AVAILABLE_RESULT_KEYS,
             available_result_keys.array(), available_result_keys.size());