diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-09-23 01:26:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-23 01:26:35 -0700 |
| commit | 08ab29a60a4f847b449c9e64f8f4649b545070a2 (patch) | |
| tree | e551de781121d0795d0cb4d4d5235d2a40e2ca01 /src/com | |
| parent | 3c5ee7fa680b4fa7bf2ec1d20d3de774b245c097 (diff) | |
| parent | b62bb6946185959ad28577fdcb175f2bd92bb014 (diff) | |
| download | LegacyCamera-08ab29a60a4f847b449c9e64f8f4649b545070a2.zip LegacyCamera-08ab29a60a4f847b449c9e64f8f4649b545070a2.tar.gz LegacyCamera-08ab29a60a4f847b449c9e64f8f4649b545070a2.tar.bz2 | |
Merge "Fix setParameters failure if users keep pressing shutter." into ics-factoryrom
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/camera/Camera.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 970d98e..2992e95 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -1415,7 +1415,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener, } private void doFocus(boolean pressed) { - if (mPausing || collapseCameraControls()) return; + if (mPausing || collapseCameraControls() || mCameraState == SNAPSHOT_IN_PROGRESS) return; // Do not do focus if there is not enough storage. if (pressed && !canTakePicture()) return; |