auto import from //branches/cupcake_rel/...@138607

1 files changed, 5 insertions, 1 deletions

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 71ed339..1111d0d 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1273,11 +1273,13 @@ public class Camera extends Activity implements View.OnClickListener,
             }
             clearFocusState();
             updateFocusIndicator();
-        } else {
+        } else if (mFocusState == FOCUSING) {
             // Half pressing the shutter (i.e. the focus button event) will 
             // already have requested AF for us, so just request capture on 
             // focus here.
             mFocusState = FOCUSING_SNAP_ON_FINISH;
+        } else if (mFocusState == FOCUS_NOT_STARTED) {
+            // Focus key down event is dropped for some reasons. Just ignore.
         }
     }
 
@@ -1527,6 +1529,8 @@ public class Camera extends Activity implements View.OnClickListener,
             mCameraDevice.stopPreview();
         }
         mPreviewing = false;
+        // If auto focus was in progress, it would have been canceled.
+        clearFocusState(); 
     }
 
     void gotoGallery() {