summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Wang <jaywang@codeaurora.org>2016-04-22 13:23:28 -0700
committerJay Wang <jaywang@codeaurora.org>2016-04-22 13:49:26 -0700
commit28d753e9370ccd93f8af43b9b907de612411c60c (patch)
treeb94af0c51f5c98718ccc5698bf8f64126b77ba53
parentc677af58364c893bbee13b7f33451d8af6e2256c (diff)
downloadandroid_packages_apps_Snap-28d753e9370ccd93f8af43b9b907de612411c60c.tar.gz
android_packages_apps_Snap-28d753e9370ccd93f8af43b9b907de612411c60c.tar.bz2
android_packages_apps_Snap-28d753e9370ccd93f8af43b9b907de612411c60c.zip
SnapdragonCamera: resolve touch af issue during countdown
Allow to cancel any on-going focus request when new touch focus request is issued. In previous implementation, the CAF was not cancelled before re-issuing new focus region, and it causes the focus to freeze. Change-Id: I51365b4d363e5d8af3eac8fb0af0d6955f86ff33 CRs-Fixed: 1007029
-rw-r--r--src/com/android/camera/FocusOverlayManager.java2
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();
}