summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-05-29 17:03:34 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2014-05-29 17:03:34 -0700
commitdf53f1cb34d73076500b51d221f5a5d7171818ba (patch)
tree758858c062e910025c31a0bf13cf9c8d8248a33d /src
parent6c97129aa46d783ffbf97faed96f5e66ca82aea4 (diff)
parentc811a1fdadae6aa466995bc753e2bcbfa376d9a6 (diff)
downloadandroid_packages_apps_Snap-df53f1cb34d73076500b51d221f5a5d7171818ba.tar.gz
android_packages_apps_Snap-df53f1cb34d73076500b51d221f5a5d7171818ba.tar.bz2
android_packages_apps_Snap-df53f1cb34d73076500b51d221f5a5d7171818ba.zip
Merge "Camera2: fix unresponsive shutter button after failure"
Diffstat (limited to 'src')
-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 dea25ced6..c71cb4d84 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -512,6 +512,7 @@ public class PhotoModule
setCameraState(IDLE);
startFaceDetection();
locationFirstRun();
+ mUI.enableShutter(true);
}
// Prompt the user to pick to record location for the very first run of