diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-08-05 22:32:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-05 22:32:00 -0700 |
| commit | 80a188c1743205093794a81b021b2ca232423d36 (patch) | |
| tree | 90fdaf1e182a815e2a53dcfff2330d8bb8f310d4 /src/com | |
| parent | b6e057422bcb6d2768274da9c1d35bff7ba16ff1 (diff) | |
| parent | 8e5e83e6c5de9186e25bca70f6efc918dd2c5050 (diff) | |
| download | LegacyCamera-80a188c1743205093794a81b021b2ca232423d36.zip LegacyCamera-80a188c1743205093794a81b021b2ca232423d36.tar.gz LegacyCamera-80a188c1743205093794a81b021b2ca232423d36.tar.bz2 | |
am 8e5e83e6: Do not cancel autofocus when snapshot is in progress.
Merge commit '8e5e83e6c5de9186e25bca70f6efc918dd2c5050'
* commit '8e5e83e6c5de9186e25bca70f6efc918dd2c5050':
Do not cancel autofocus when snapshot is in progress.
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/camera/Camera.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index c438522..0502d97 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -1401,8 +1401,8 @@ public class Camera extends NoSearchActivity implements View.OnClickListener, private void cancelAutoFocus() { // User releases half-pressed focus key. - if (mFocusState == FOCUSING || mFocusState == FOCUS_SUCCESS - || mFocusState == FOCUS_FAIL) { + if (mStatus != SNAPSHOT_IN_PROGRESS && (mFocusState == FOCUSING + || mFocusState == FOCUS_SUCCESS || mFocusState == FOCUS_FAIL)) { Log.v(TAG, "Cancel autofocus."); mHeadUpDisplay.setEnabled(true); mCameraDevice.cancelAutoFocus(); |