summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLikai Ding <likaid@codeaurora.org>2014-06-06 11:25:20 +0800
committerAbhisek Devkota <ciwrl@cyanogenmod.com>2014-10-21 00:32:46 +0000
commitcd9fe44e1a42dcb328772b44c6ca0434a1c7a49f (patch)
tree1b8acfd7e9d5f34cafb4ea540d20de9417d3eeb2
parent46f2f7cc757631887441169b6fd0ec0c4ebb1899 (diff)
downloadandroid_packages_apps_Camera2-cd9fe44e1a42dcb328772b44c6ca0434a1c7a49f.tar.gz
android_packages_apps_Camera2-cd9fe44e1a42dcb328772b44c6ca0434a1c7a49f.tar.bz2
android_packages_apps_Camera2-cd9fe44e1a42dcb328772b44c6ca0434a1c7a49f.zip
Camera2: disable the shutter button when not previewing
Camera app will crash if the shutter button is clicked while not previewing. Disable the shutter button in onStopPreview() as it's called by onSurfaceTextureDestroyed(). Change-Id: Ied369610c590323b977b4ac1c3150c6c905e9466 CRs-Fixed: 669190
-rw-r--r--src/com/android/camera/VideoModule.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 68bc4c39c..a346d0560 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -1074,6 +1074,7 @@ public class VideoModule implements CameraModule,
mCameraDevice.stopPreview();
mPreviewing = false;
mStopPrevPending = false;
+ mUI.enableShutter(false);
}
private void closeCamera() {