From 2160a59f67d3a9543e1234b50b2255c635d1a721 Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Fri, 1 May 2015 18:32:14 -0400
Subject: Camera2: Only autofocus before a snap if we are actually in "auto"
 mode.

Original commit by cyanogen 7daaa72d35c1f8820117768e4b129acd030bcefb

Change-Id: I51853913f6459b599176910f7f486f59972eaf36
---
 src/com/android/camera/FocusOverlayManager.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java
index 405237744..d248a0139 100644
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -568,10 +568,7 @@ public class FocusOverlayManager {
     }
 
     private boolean needAutoFocusCall() {
-        String focusMode = getFocusMode(false);
-        return !(focusMode.equals(Parameters.FOCUS_MODE_INFINITY)
-                || focusMode.equals(Parameters.FOCUS_MODE_FIXED)
-                || focusMode.equals(Parameters.FOCUS_MODE_EDOF));
+        return getFocusMode(false).equals(Parameters.FOCUS_MODE_AUTO);
     }
 
     public void setZslEnable(boolean value) {
-- 
cgit v1.2.3