commit 32b231ac953e38ef4bbd5f5c8718e052f752ecff
author Linux Build Service Account <lnxbuild@localhost> Tue May 07 19:30:34 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue May 07 19:30:34 2013 -0700
tree b36d15605632edc236a0ffa6bb2e4a8e4d75d2b4
parent 35c6b7d55a21063f3c9fdbdc8a3a6fa8dbdfb28f
parent d8cd8996d9bc65c3f5a2ddd3c054ccda77f87dea

Merge "QCamera2: support 4k camcorder"

QCamera2/HAL/QCameraStateMachine.cpp

diff --git a/QCamera2/HAL/QCameraStateMachine.cpp b/QCamera2/HAL/QCameraStateMachine.cpp
index 44ff872..42fe32e 100644
--- a/QCamera2/HAL/QCameraStateMachine.cpp
+++ b/QCamera2/HAL/QCameraStateMachine.cpp
@@ -1090,31 +1090,36 @@
     case QCAMERA_SM_EVT_TAKE_PICTURE:
        {
            if ( m_parent->mParameters.getRecordingHintValue() == false) {
-           rc = m_parent->takePicture();
-           if (rc == NO_ERROR) {
-               // move state to picture taking state
                if (m_parent->isZSLMode()) {
                    m_state = QCAMERA_SM_STATE_PREVIEW_PIC_TAKING;
+                   rc = m_parent->takePicture();
+                   if (rc != NO_ERROR) {
+                       // move state to previewing state
+                       m_state = QCAMERA_SM_STATE_PREVIEWING;
+                   }
                } else {
                    m_state = QCAMERA_SM_STATE_PIC_TAKING;
+                   rc = m_parent->takePicture();
+                   if (rc != NO_ERROR) {
+                       // move state to preview stopped state
+                       m_state = QCAMERA_SM_STATE_PREVIEW_STOPPED;
+                   }
                }
-            } else {
-                // move state to preview stopped state
-                m_state = QCAMERA_SM_STATE_PREVIEW_STOPPED;
-            }
-            result.status = rc;
-            result.request_api = evt;
-            result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
-            m_parent->signalAPIResult(&result);
+
+               result.status = rc;
+               result.request_api = evt;
+               result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
+               m_parent->signalAPIResult(&result);
            } else {
+               m_state = QCAMERA_SM_STATE_PREVIEW_PIC_TAKING;
                rc = m_parent->takeLiveSnapshot();
-               if (rc == NO_ERROR ) {
-                   m_state = QCAMERA_SM_STATE_PREVIEW_PIC_TAKING;
-                   result.status = rc;
-                   result.request_api = evt;
-                   result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
-                   m_parent->signalAPIResult(&result);
+               if (rc != NO_ERROR ) {
+                   m_state = QCAMERA_SM_STATE_PREVIEWING;
                }
+               result.status = rc;
+               result.request_api = evt;
+               result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
+               m_parent->signalAPIResult(&result);
            }
         }
         break;