summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-09-11 11:01:18 -0700
committerEino-Ville Talvala <etalvala@google.com>2012-09-11 11:27:46 -0700
commitccd795f3c52e626b6eb37a9b6c6ad4ca2f68aa03 (patch)
treec1c8b88277fce8e502772fad1e05a15c31075349 /services
parentd6de933cfcc088d7c80e26bcca4d3b20b1573225 (diff)
downloadframeworks_av-ccd795f3c52e626b6eb37a9b6c6ad4ca2f68aa03.zip
frameworks_av-ccd795f3c52e626b6eb37a9b6c6ad4ca2f68aa03.tar.gz
frameworks_av-ccd795f3c52e626b6eb37a9b6c6ad4ca2f68aa03.tar.bz2
Camera1: Fix enable shutter sound command error handling.
Return the error codes from calls to enableShutterSound to the caller, and don't call the HAL with the enable shutter sound command. Change-Id: Ibe4943bd1cd0fcd1832fd904f12dd2f78fec06a5
Diffstat (limited to 'services')
-rw-r--r--services/camera/libcameraservice/CameraClient.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/services/camera/libcameraservice/CameraClient.cpp b/services/camera/libcameraservice/CameraClient.cpp
index 562384d..c9c816a 100644
--- a/services/camera/libcameraservice/CameraClient.cpp
+++ b/services/camera/libcameraservice/CameraClient.cpp
@@ -608,11 +608,9 @@ status_t CameraClient::sendCommand(int32_t cmd, int32_t arg1, int32_t arg2) {
} else if (cmd == CAMERA_CMD_ENABLE_SHUTTER_SOUND) {
switch (arg1) {
case 0:
- enableShutterSound(false);
- break;
+ return enableShutterSound(false);
case 1:
- enableShutterSound(true);
- break;
+ return enableShutterSound(true);
default:
return BAD_VALUE;
}