diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-09-11 11:37:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-11 11:37:18 -0700 |
| commit | eb37db0ff21ab89d9870099d8fe7c073d58f1c6e (patch) | |
| tree | 4ed13bd5c14d1f526bdbda067e900dc21ecca16a /services/camera/libcameraservice | |
| parent | b912ed80e19e3d95f670f33900e338691c05dc1e (diff) | |
| parent | ccd795f3c52e626b6eb37a9b6c6ad4ca2f68aa03 (diff) | |
| download | frameworks_av-eb37db0ff21ab89d9870099d8fe7c073d58f1c6e.zip frameworks_av-eb37db0ff21ab89d9870099d8fe7c073d58f1c6e.tar.gz frameworks_av-eb37db0ff21ab89d9870099d8fe7c073d58f1c6e.tar.bz2 | |
Merge "Camera1: Fix enable shutter sound command error handling." into jb-mr1-dev
Diffstat (limited to 'services/camera/libcameraservice')
| -rw-r--r-- | services/camera/libcameraservice/CameraClient.cpp | 6 |
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; } |