diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-09-23 14:13:05 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2011-09-23 14:23:05 +0800 |
| commit | b62bb6946185959ad28577fdcb175f2bd92bb014 (patch) | |
| tree | b5fea845d177d0b2c16fbcf3163190d9ad9c3ae6 /src/com | |
| parent | dd28e1cc00373c02adf88dff878dbbe5d8be9e59 (diff) | |
| download | LegacyCamera-b62bb6946185959ad28577fdcb175f2bd92bb014.zip LegacyCamera-b62bb6946185959ad28577fdcb175f2bd92bb014.tar.gz LegacyCamera-b62bb6946185959ad28577fdcb175f2bd92bb014.tar.bz2 | |
Fix setParameters failure if users keep pressing shutter.
Do not call setParameters, autoFocus, or cancelAutoFocus if the
snapshot is in progress.
bug:5359430
Change-Id: I17a367643c85e0e65b2ba3f9c1ab9ace86c52722
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; |