summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorJay Wang <jaywang@codeaurora.org>2016-04-22 13:23:28 -0700
committerSteve Kondik <steve@cyngn.com>2016-08-03 15:45:46 -0700
commit72cf374de3e7d2d18eb53fa797342dbae926413a (patch)
tree0f71157d7eef5ce911080fc743325743ffde7ac9 /src/com
parent16ac0c5d1326a232624804a9d5697274186fcce4 (diff)
downloadandroid_packages_apps_Snap-72cf374de3e7d2d18eb53fa797342dbae926413a.tar.gz
android_packages_apps_Snap-72cf374de3e7d2d18eb53fa797342dbae926413a.tar.bz2
android_packages_apps_Snap-72cf374de3e7d2d18eb53fa797342dbae926413a.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
Diffstat (limited to 'src/com')
-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 d7005c7fe..f87f9fcb5 100644
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -372,7 +372,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();
}