am 1d5ec3cb: Merge change 20382 into donut

Merge commit '1d5ec3cba971ecb2d49fef0640a221a30c707e49'

* commit '1d5ec3cba971ecb2d49fef0640a221a30c707e49':
  Fix issue 2039521: Pressing back key doesn't work.

1 files changed, 5 insertions, 1 deletions

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 1db7862..fe6b1c7 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1116,10 +1116,14 @@ public class Camera extends Activity implements View.OnClickListener,
         }
     }
 
+    private boolean canTakePicture() {
+        return isCameraIdle() && mPreviewing && (mPicturesRemaining > 0);
+    }
+
     private void autoFocus() {
         // Initiate autofocus only when preview is started and snapshot is not
         // in progress.
-        if (isCameraIdle() && mPreviewing) {
+        if (canTakePicture()) {
             Log.v(TAG, "Start autofocus.");
             if (mZoomButtons != null) mZoomButtons.setVisible(false);
             mFocusStartTime = System.currentTimeMillis();