commit 53e022de0580e2bf42eb34d365f313f4bc87ca1a
author Shuzhen Wang <shuzhenw@codeaurora.org> Wed Jun 04 22:17:25 2014 -0700
committer satyavaraprasad yerramsetti <satyav@codeaurora.org> Mon Aug 04 14:56:30 2014 +0530
tree e148e29787051b7324cd55e5dc229b1a0c20f1c7
parent 1e1d644ad67929f52133b418758c7adf4cd6e595

QCamera2: HAL: Featurize value added features

For features requiring camera frameworks enhancement, featurize
them such that HAL can compile against vanilla camera frameworks.

Change-Id: I6266aa4e7906e64d8c0f43acbb6274db882a5d76

QCamera2/HAL/QCameraStateMachine.cpp

diff --git a/QCamera2/HAL/QCameraStateMachine.cpp b/QCamera2/HAL/QCameraStateMachine.cpp
index 1f4c422..8c79757 100644
--- a/QCamera2/HAL/QCameraStateMachine.cpp
+++ b/QCamera2/HAL/QCameraStateMachine.cpp
@@ -1599,10 +1599,12 @@
             rc = m_parent->sendCommand(cmd_payload->cmd,
                                        cmd_payload->arg1,
                                        cmd_payload->arg2);
+#ifndef VANILLA_HAL
             if ( CAMERA_CMD_LONGSHOT_OFF == cmd_payload->cmd ) {
                 // move state to previewing state
                 m_state = QCAMERA_SM_STATE_PREVIEWING;
             }
+#endif
             result.status = rc;
             result.request_api = evt;
             result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -2650,10 +2652,12 @@
             rc = m_parent->sendCommand(cmd_payload->cmd,
                                        cmd_payload->arg1,
                                        cmd_payload->arg2);
+#ifndef VANILLA_HAL
             if ( CAMERA_CMD_LONGSHOT_OFF == cmd_payload->cmd ) {
                 // move state to previewing state
                 m_state = QCAMERA_SM_STATE_PREVIEWING;
             }
+#endif
             result.status = rc;
             result.request_api = evt;
             result.result_type = QCAMERA_API_RESULT_TYPE_DEF;