diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-09-13 09:35:18 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2011-09-13 09:35:18 +0800 |
| commit | 620e427c0aa990458d39b43477675b768d360327 (patch) | |
| tree | 31f0815815fca2075f5a97a2aad23e024f3b7330 /src/com/android/camera/FocusManager.java | |
| parent | 595d33f1308089ea4e656e247548a71b218d9fa5 (diff) | |
| download | LegacyCamera-620e427c0aa990458d39b43477675b768d360327.zip LegacyCamera-620e427c0aa990458d39b43477675b768d360327.tar.gz LegacyCamera-620e427c0aa990458d39b43477675b768d360327.tar.bz2 | |
Fix AF failure when shutter and tap focus are triggered at the same time.
When the shutter button and the viewfinder are tapped simultaneously.
(1) onTouch ACTION_DOWN. Tap area is set and AF is not started yet.
(2) Shutter doFocus. AF starts.
(3) onTouch ACTION_UP. AF is called again and an exception is thrown.
Now onTouch always cancelAutoFocus if AF is in progress and the state
is not STATE_FOCUSING_SNAP_ON_FINISH.
bug:5265128
Change-Id: Ib52dcc5169132dde2b688062d812d59e0d7c2d7c
Diffstat (limited to 'src/com/android/camera/FocusManager.java')
| -rw-r--r-- | src/com/android/camera/FocusManager.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/camera/FocusManager.java b/src/com/android/camera/FocusManager.java index ca8d940..2969da5 100644 --- a/src/com/android/camera/FocusManager.java +++ b/src/com/android/camera/FocusManager.java @@ -208,9 +208,8 @@ public class FocusManager { if (!mInitialized || mState == STATE_FOCUSING_SNAP_ON_FINISH) return false; // Let users be able to cancel previous touch focus. - if ((mTapArea != null) && (e.getAction() == MotionEvent.ACTION_DOWN) - && (mState == STATE_FOCUSING || mState == STATE_SUCCESS || - mState == STATE_FAIL)) { + if ((mTapArea != null) && (mState == STATE_FOCUSING || + mState == STATE_SUCCESS || mState == STATE_FAIL)) { cancelAutoFocus(); } |