From 5f5ed49477e4dc100e699e932d3f7db2186fb1c2 Mon Sep 17 00:00:00 2001 From: Suman Mukherjee Date: Fri, 21 Apr 2017 12:03:10 +0530 Subject: msm8996-common: QCamera2: Fixed compilation error for AOSP upgrade Fixed compilation error for O Change-Id: I119310169015f5713ff78df090935777a8350795 Signed-off-by: Davide Garberi --- camera/QCamera2/HAL/QCamera2HWI.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'camera/QCamera2/HAL/QCamera2HWI.cpp') diff --git a/camera/QCamera2/HAL/QCamera2HWI.cpp b/camera/QCamera2/HAL/QCamera2HWI.cpp index e1e1611..1e6f310 100644 --- a/camera/QCamera2/HAL/QCamera2HWI.cpp +++ b/camera/QCamera2/HAL/QCamera2HWI.cpp @@ -6538,6 +6538,8 @@ int32_t QCamera2HardwareInterface::processPrepSnapshotDoneEvent( 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 @@ -6556,7 +6558,6 @@ int32_t QCamera2HardwareInterface::processASDUpdate( return UNKNOWN_ERROR; } -#ifndef VANILLA_HAL pASDData[0] = CAMERA_META_DATA_ASD; pASDData[1] = (int)data_len; pASDData[2] = asd_decision.detected_scene; @@ -6574,8 +6575,8 @@ int32_t QCamera2HardwareInterface::processASDUpdate( LOGE("fail sending notification"); asdBuffer->release(asdBuffer); } -#endif } +#endif return NO_ERROR; } -- cgit v1.2.3