summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLikai Ding <likaid@codeaurora.org>2014-05-29 10:57:34 +0800
committerAbhisek Devkota <ciwrl@cyanogenmod.com>2014-10-20 22:22:35 +0000
commit529889fbdfd961c5677cfee140a6471f89804b32 (patch)
tree2361f9ee2455d929dc64a990b4e6e141b98356c8
parente7c249ed95e855c6e2cfd2b666ff860c9a7a091c (diff)
downloadandroid_packages_apps_Camera2-529889fbdfd961c5677cfee140a6471f89804b32.tar.gz
android_packages_apps_Camera2-529889fbdfd961c5677cfee140a6471f89804b32.tar.bz2
android_packages_apps_Camera2-529889fbdfd961c5677cfee140a6471f89804b32.zip
Camera2: fix unresponsive shutter button after failure
Shutter button is disabled during capture(). It's only re-enabled in onPicutreTaken() callback. If camera is switched just before counting down finishes, picture taking may fail and shutter button is left disabled. Enabling shutter button in onPreviewStarted() fixes the problem. Change-Id: I92c644e9a0d283f9ab0269b85586f27e0f4eeb1b CRs-Fixed: 667311
-rw-r--r--src/com/android/camera/PhotoModule.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 6a66f5f8d..3ecf1ea70 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -548,6 +548,7 @@ public class PhotoModule
mFocusManager.onPreviewStarted();
startFaceDetection();
locationFirstRun();
+ mUI.enableShutter(true);
}
// Prompt the user to pick to record location for the very first run of