summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-05-01 18:32:14 -0400
committerArne Coucheron <arco68@gmail.com>2018-01-26 01:08:21 +0100
commite5f7e1a40f9dac9fd26425fabeddc745e8d47324 (patch)
tree83c904cba5488e37be2d9d101f09e3b87061436a
parent81e6b765f07d28172b008a88c5c90754af4d5e69 (diff)
downloadandroid_packages_apps_Snap-e5f7e1a40f9dac9fd26425fabeddc745e8d47324.zip
android_packages_apps_Snap-e5f7e1a40f9dac9fd26425fabeddc745e8d47324.tar.gz
android_packages_apps_Snap-e5f7e1a40f9dac9fd26425fabeddc745e8d47324.tar.bz2
Camera2: Only autofocus before a snap if we are actually in "auto" mode.
Original commit by cyanogen 7daaa72d35c1f8820117768e4b129acd030bcefb Change-Id: I51853913f6459b599176910f7f486f59972eaf36
-rwxr-xr-xsrc/com/android/camera/FocusOverlayManager.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java
index ed66210..5875c15 100755
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -634,10 +634,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) {