summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-03-22 03:26:45 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-03-22 03:26:45 -0700
commitf0db303f9e3cb65bff565d5b2f7bc2fd721efa6c (patch)
tree9ab2ff1fcc32ec7c21601c237857523ce279eda0
parent9dbe81caeb6849ec47a25aba0162938dbe9ff60b (diff)
parent9ac4447eba80c1af34d38e40ccf5cffb77b87757 (diff)
downloadandroid_packages_apps_Snap-f0db303f9e3cb65bff565d5b2f7bc2fd721efa6c.tar.gz
android_packages_apps_Snap-f0db303f9e3cb65bff565d5b2f7bc2fd721efa6c.tar.bz2
android_packages_apps_Snap-f0db303f9e3cb65bff565d5b2f7bc2fd721efa6c.zip
Merge "SnapdragonCamera: Fix shutter sound issue" into camera.lnx.1.0-dev.1.0
-rw-r--r--src/com/android/camera/AndroidCameraManagerImpl.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java
index a1b092f1a..62a0854d9 100644
--- a/src/com/android/camera/AndroidCameraManagerImpl.java
+++ b/src/com/android/camera/AndroidCameraManagerImpl.java
@@ -352,6 +352,7 @@ class AndroidCameraManagerImpl implements CameraManager {
case SET_ONESHOT_PREVIEW_CALLBACK:
mCamera.setOneShotPreviewCallback((PreviewCallback) msg.obj);
+ return;
case ENABLE_SHUTTER_SOUND:
enableShutterSound((msg.arg1 == 1) ? true : false);