commit 7c64073f546701ac0ddf0921ddb0b744a296f8c8
author Mekala Natarajan <mekalan@codeaurora.org> Wed Oct 23 21:44:06 2013 -0700
committer Iliyan Malchev <malchev@google.com> Thu Oct 24 09:40:00 2013 -0700
tree 06eef09629435dcb5e903c1edbcdfdff704e4d23
parent b6fae154c4d104ee7ff43306e67f46476f06228c

camera: Handle camcorder trigger while snapshot is in process

Handle camcorder trigger while snapshot is in process

Bug: 11062739
Change-Id: Ib2753d11f4a72d7c3cc2d3bae458b54556a6dc15

camera/QCameraHWI.cpp

diff --git a/camera/QCameraHWI.cpp b/camera/QCameraHWI.cpp
index 7fbb40c..e8759be 100755
--- a/camera/QCameraHWI.cpp
+++ b/camera/QCameraHWI.cpp
@@ -1232,7 +1232,11 @@
             stopPreviewInternal();
             mPreviewState = QCAMERA_HAL_PREVIEW_STOPPED;
             break;
-      case QCAMERA_HAL_TAKE_PICTURE:
+    case QCAMERA_HAL_TAKE_PICTURE:
+        cancelPictureInternal();
+        stopPreviewInternal();
+        mPreviewState = QCAMERA_HAL_PREVIEW_STOPPED;
+        break;
       case QCAMERA_HAL_PREVIEW_STOPPED:
       default:
             break;