Merge "SnapdragonCamera: Avoid shutter button double clicked in short time"

1 files changed, 8 insertions, 2 deletions

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index b2fef12f4..bba073f68 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -255,6 +255,8 @@ public class PhotoModule
     private byte[] mLastJpegData;
     private int mLastJpegOrientation = 0;
 
+    private boolean mShutterPressing = false;
+
     private Runnable mDoSnapRunnable = new Runnable() {
         @Override
         public void run() {
@@ -2044,14 +2046,16 @@ public class PhotoModule
 
     @Override
     public void onShutterButtonClick() {
-        if (mPaused || mUI.collapseCameraControls()
+        if (mPaused || mShutterPressing
+                || mUI.collapseCameraControls()
                 || (mCameraState == SWITCHING_CAMERA)
                 || (mCameraState == PREVIEW_STOPPED)) return;
-
+        mShutterPressing = true;
         // Do not take the picture if there is not enough storage.
         if (mActivity.getStorageSpaceBytes() <= Storage.LOW_STORAGE_THRESHOLD_BYTES) {
             Log.i(TAG, "Not enough space or storage not ready. remaining="
                     + mActivity.getStorageSpaceBytes());
+            mShutterPressing = false;
             return;
         }
         Log.v(TAG, "onShutterButtonClick: mCameraState=" + mCameraState);
@@ -2079,6 +2083,7 @@ public class PhotoModule
                 || mCameraState == SNAPSHOT_IN_PROGRESS)
                 && !mIsImageCaptureIntent) {
             mSnapshotOnIdle = true;
+            mShutterPressing = false;
             return;
         }
 
@@ -2104,6 +2109,7 @@ public class PhotoModule
             mSnapshotOnIdle = false;
             mFocusManager.doSnap();
         }
+        mShutterPressing = false;
     }
 
     @Override