commit 874a4618b645ab5c1faaa738a871f52492f28de3
author Eino-Ville Talvala <etalvala@google.com> Mon Sep 17 08:37:25 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 17 08:37:25 2012 -0700
tree 486c6875f3ca1109438de8284140bf95480b01b6
parent 376074ed1c3c368aeb336954a07632cd806288e2
parent efb039e07c688c21122c938b008457bd4f555898

Merge "Camera2: Don't play shutter sound when doing a video snapshot" into jb-mr1-dev

services/camera/libcameraservice/camera2/CaptureSequencer.cpp

diff --git a/services/camera/libcameraservice/camera2/CaptureSequencer.cpp b/services/camera/libcameraservice/camera2/CaptureSequencer.cpp
index 678f114..981fdb4 100644
--- a/services/camera/libcameraservice/camera2/CaptureSequencer.cpp
+++ b/services/camera/libcameraservice/camera2/CaptureSequencer.cpp
@@ -410,7 +410,8 @@
         return DONE;
     }
 
-    if (l.mParameters.playShutterSound) {
+    if (l.mParameters.playShutterSound &&
+            l.mParameters.state == Parameters::STILL_CAPTURE) {
         client->getCameraService()->playSound(CameraService::SOUND_SHUTTER);
     }