commit 3d800e9731da0c44a773ae53b79d5eae222749e5
author Linux Build Service Account <lnxbuild@localhost> Thu Dec 05 05:44:42 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Dec 05 05:44:42 2013 -0800
tree 8f722489e3cf9445ddce098ae88b219c6072d3be
parent 1c7734057201ffd1b6d165d9e24793ef3d213043
parent cb2ad049e55c63e3a66a5b0f154c5d3e7930087a

Merge "Camera: Wait for focus to be done before starting long shot"

src/com/android/camera/PhotoModule.java

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 176885c..1b83c36 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1139,7 +1139,7 @@
 
             mAutoFocusTime = System.currentTimeMillis() - mFocusStartTime;
             Log.v(TAG, "mAutoFocusTime = " + mAutoFocusTime + "ms");
-            setCameraState(IDLE);
+            if (mCameraState != PhotoController.LONGSHOT) setCameraState(IDLE);
             mFocusManager.onAutoFocus(focused, mUI.isShutterPressed());
         }
     }
@@ -1588,7 +1588,7 @@
 
     @Override
     public void onShutterButtonLongClick() {
-        if ((null != mCameraDevice) && (mCameraState == IDLE)) {
+        if ((null != mCameraDevice) && ((mCameraState == IDLE) || (mCameraState == FOCUSING))) {
             boolean enable = false;
             enable = SystemProperties.getBoolean(PERSIST_LONG_ENABLE, false);
             if ( enable ) {