commit 5fdb73375a8841f2ecbca593850a6cc17798674a
author Shuzhen Wang <shuzhenwang@google.com> Fri Feb 09 12:25:28 2018 -0800
committer Shuzhen Wang <shuzhenwang@google.com> Fri Mar 16 21:51:32 2018 -0700
tree c0ff9eafb5e05291bc055a1ac23c035ad3e37c8f
parent b1d46b55398885f2ed8442fff842119f2b30f72a

QCamera2: HAL3: Add new capture intent definition

Test: Camera CTS
Bug: 70565622
Change-Id: I9089dd948d4dce433ca70c3db040b8512f606128

msm8998/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
index eeeb40a..8f9fd85 100644
--- a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
@@ -13567,6 +13567,10 @@
     if (frame_settings.exists(NEXUS_EXPERIMENTAL_2016_HYBRID_AE_ENABLE)) {
         uint8_t *hybrid_ae = (uint8_t *)
                 frame_settings.find(NEXUS_EXPERIMENTAL_2016_HYBRID_AE_ENABLE).data.u8;
+        // Motion tracking intent isn't compatible with hybrid ae.
+        if (mCaptureIntent == CAM_INTENT_MOTION_TRACKING) {
+            *hybrid_ae = 0;
+        }
         if (ADD_SET_PARAM_ENTRY_TO_BATCH(hal_metadata, CAM_INTF_META_HYBRID_AE, *hybrid_ae)) {
             rc = BAD_VALUE;
         }