summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-09-15 13:27:52 -0700
committerEino-Ville Talvala <etalvala@google.com>2012-09-15 13:27:52 -0700
commitbd3a81653a9bbdf7aa9394d99f2fc9b7dabf68dc (patch)
treecf2d12cbff1c71a152a9c36d6b9e831cac37554d /services
parent482136a5f977056eeffe2aa58d31ce395be562a3 (diff)
downloadframeworks_av-bd3a81653a9bbdf7aa9394d99f2fc9b7dabf68dc.zip
frameworks_av-bd3a81653a9bbdf7aa9394d99f2fc9b7dabf68dc.tar.gz
frameworks_av-bd3a81653a9bbdf7aa9394d99f2fc9b7dabf68dc.tar.bz2
Camera2: Don't play shutter sound when doing a video snapshot
Bug: 7171820 Change-Id: I11ec0900aff3cdf4b57ae1bfc75f7acfecf95098
Diffstat (limited to 'services')
-rw-r--r--services/camera/libcameraservice/camera2/CaptureSequencer.cpp3
1 files changed, 2 insertions, 1 deletions
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 @@ CaptureSequencer::CaptureState CaptureSequencer::manageStandardCapture(
return DONE;
}
- if (l.mParameters.playShutterSound) {
+ if (l.mParameters.playShutterSound &&
+ l.mParameters.state == Parameters::STILL_CAPTURE) {
client->getCameraService()->playSound(CameraService::SOUND_SHUTTER);
}