commit 0f3079f4e4afabb7525d75aa64983b7f57cb911c
author Thierry Strudel <tstrudel@google.com> Fri Sep 09 23:28:55 2016 -0700
committer Thierry Strudel <tstrudel@google.com> Mon Sep 12 09:32:18 2016 -0700
tree ba417bc3df39f35cc744ef38ae5a7b971249c571
parent a7910b315898a20f5ee70e24780883d1c92d5be4

CAMERA_MSG_META_DATA not defined in AOSP camera HAL

Bug: 31420007
Change-Id: Ifd635093d3ceb0443719b761b1d5b728caf8037b

msmcobalt/QCamera2/HAL/QCamera2HWI.cpp

diff --git a/msmcobalt/QCamera2/HAL/QCamera2HWI.cpp b/msmcobalt/QCamera2/HAL/QCamera2HWI.cpp
index 3843cf5..46181b1 100644
--- a/msmcobalt/QCamera2/HAL/QCamera2HWI.cpp
+++ b/msmcobalt/QCamera2/HAL/QCamera2HWI.cpp
@@ -6517,6 +6517,7 @@
 int32_t QCamera2HardwareInterface::processASDUpdate(
         __unused cam_asd_decision_t asd_decision)
 {
+#ifndef VANILLA_HAL
     if ( msgTypeEnabled(CAMERA_MSG_META_DATA) ) {
         size_t data_len = sizeof(cam_auto_scene_t);
         size_t buffer_len = 1 *sizeof(int)       //meta type
@@ -6535,7 +6536,6 @@
             return UNKNOWN_ERROR;
         }
 
-#ifndef VANILLA_HAL
         pASDData[0] = CAMERA_META_DATA_ASD;
         pASDData[1] = (int)data_len;
         pASDData[2] = asd_decision.detected_scene;
@@ -6553,8 +6553,8 @@
             LOGE("fail sending notification");
             asdBuffer->release(asdBuffer);
         }
-#endif
     }
+#endif
     return NO_ERROR;
 }