summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKerong Sui <ksui@codeaurora.org>2013-09-17 16:47:14 +0800
committerSteve Kondik <shade@chemlab.org>2013-10-01 03:32:39 -0700
commit84b9abcc09f8698afb648bf1cf5555224b4bc93b (patch)
tree6ebd50a1769d166fe1aced78abd555aef8cda9da
parentc9cd2f1a644ad852ddb5dba921e7d4675a2ca78e (diff)
downloadandroid_packages_apps_Gallery2-84b9abcc09f8698afb648bf1cf5555224b4bc93b.tar.gz
android_packages_apps_Gallery2-84b9abcc09f8698afb648bf1cf5555224b4bc93b.tar.bz2
android_packages_apps_Gallery2-84b9abcc09f8698afb648bf1cf5555224b4bc93b.zip
Camera: Block shutter button during mode switch
Video recording will crash if start recording before startpreview is done, so we need to disable shutter button before preview is ready. Move the function which block shutter button after showVideoSnapshotUI as the button will be enabled inside this function. Change-Id: I9b7c4e352bd1f15742a4bdb7494a2e53f25d7a99 CRs-fixed: 545612
-rw-r--r--src/com/android/camera/VideoModule.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index e606d17d6..1e2cb26b7 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -792,10 +792,10 @@ public class VideoModule implements CameraModule,
public void onResumeAfterSuper() {
if (mActivity.mOpenCameraFail || mActivity.mCameraDisabled)
return;
- mUI.enableShutter(false);
mZoomValue = 0;
showVideoSnapshotUI(false);
+ mUI.enableShutter(false);
if (!mPreviewing && mStartPreviewThread == null) {
resetEffect();