diff options
| author | Suman Mukherjee <sumam@codeaurora.org> | 2017-04-21 12:03:10 +0530 |
|---|---|---|
| committer | Davide Garberi <dade.garberi@gmail.com> | 2018-01-19 14:09:16 +0100 |
| commit | 5f5ed49477e4dc100e699e932d3f7db2186fb1c2 (patch) | |
| tree | 4044e9dcb282e0e4341ffaa85aa369e57968a5c9 /camera/QCamera2/HAL/QCamera2HWI.cpp | |
| parent | ea6860b04efe5f4752b84c24db0fa595223ee9bb (diff) | |
msm8996-common: QCamera2: Fixed compilation error for AOSP upgrade
Fixed compilation error for O
Change-Id: I119310169015f5713ff78df090935777a8350795
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
Diffstat (limited to 'camera/QCamera2/HAL/QCamera2HWI.cpp')
| -rw-r--r-- | camera/QCamera2/HAL/QCamera2HWI.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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; } |