summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/Camera2Client.cpp
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2012-11-26 10:50:55 -0800
committerIgor Murashkin <iam@google.com>2012-11-26 16:01:48 -0800
commitaa9e3e01b86bd9bfb5ac36c0f360d5fe478cbb2d (patch)
tree57a32f0f9b4c601704d9e072ece1f5d05d706f1a /services/camera/libcameraservice/Camera2Client.cpp
parentd983364b3655a547b55bb11dbe148103198c011d (diff)
downloadframeworks_av-aa9e3e01b86bd9bfb5ac36c0f360d5fe478cbb2d.zip
frameworks_av-aa9e3e01b86bd9bfb5ac36c0f360d5fe478cbb2d.tar.gz
frameworks_av-aa9e3e01b86bd9bfb5ac36c0f360d5fe478cbb2d.tar.bz2
Camera: Play shutter sound iff enableShutterSound(true) && ShutterCallback !null
Bug: 7564718 Change-Id: Ie7821cdee57966d88af048759578439a3e6ecb2e
Diffstat (limited to 'services/camera/libcameraservice/Camera2Client.cpp')
-rw-r--r--services/camera/libcameraservice/Camera2Client.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp
index e59a240..0f1e650 100644
--- a/services/camera/libcameraservice/Camera2Client.cpp
+++ b/services/camera/libcameraservice/Camera2Client.cpp
@@ -1111,7 +1111,7 @@ status_t Camera2Client::takePicture(int msgType) {
// Need HAL to have correct settings before (possibly) triggering precapture
syncWithDevice();
- res = mCaptureSequencer->startCapture();
+ res = mCaptureSequencer->startCapture(msgType);
if (res != OK) {
ALOGE("%s: Camera %d: Unable to start capture: %s (%d)",
__FUNCTION__, mCameraId, strerror(-res), res);