commit 6b741069fbe98a3b75ae8744f4a7790525199deb
author Linux Build Service Account <lnxbuild@localhost> Tue May 03 09:17:47 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue May 03 09:17:47 2016 -0700
tree 9bf44685fbea218cd59b22221bd6dfb086e93889
parent a58d5dc70a39f92453d62dd7d70b6ea7519f63a6
parent 28d753e9370ccd93f8af43b9b907de612411c60c

Merge "SnapdragonCamera: resolve touch af issue during countdown" into camera.lnx.1.0-dev.1.0

src/com/android/camera/FocusOverlayManager.java

diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java
index c5ffef5..23b31b1 100644
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -373,7 +373,7 @@
                 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();
         }