diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-05-03 09:17:47 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-05-03 09:17:47 -0700 |
| commit | 6b741069fbe98a3b75ae8744f4a7790525199deb (patch) | |
| tree | 9bf44685fbea218cd59b22221bd6dfb086e93889 | |
| parent | a58d5dc70a39f92453d62dd7d70b6ea7519f63a6 (diff) | |
| parent | 28d753e9370ccd93f8af43b9b907de612411c60c (diff) | |
| download | android_packages_apps_Snap-6b741069fbe98a3b75ae8744f4a7790525199deb.tar.gz android_packages_apps_Snap-6b741069fbe98a3b75ae8744f4a7790525199deb.tar.bz2 android_packages_apps_Snap-6b741069fbe98a3b75ae8744f4a7790525199deb.zip | |
Merge "SnapdragonCamera: resolve touch af issue during countdown" into camera.lnx.1.0-dev.1.0
| -rw-r--r-- | src/com/android/camera/FocusOverlayManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java index c5ffef5c5..23b31b14d 100644 --- a/src/com/android/camera/FocusOverlayManager.java +++ b/src/com/android/camera/FocusOverlayManager.java @@ -373,7 +373,7 @@ public class FocusOverlayManager { UsageStatistics.ACTION_TOUCH_FOCUS, x + "," + y); // Let users be able to cancel previous touch focus. - if ((mFocusArea != null) && (mState == STATE_FOCUSING || + if ((mState == STATE_FOCUSING || mState == STATE_SUCCESS || mState == STATE_FAIL)) { cancelAutoFocus(); } |