summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-05-01 18:32:14 -0400
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-05-08 19:18:59 +0000
commit96dbd9182b09979bb900af58d4a02078697e770e (patch)
tree57bc6ff4645cc92f9c5ef4271a772923ce2dc471
parent6403559e01c695db50b50d52a1623e5c28ff5a08 (diff)
downloadandroid_packages_apps_Camera2-96dbd9182b09979bb900af58d4a02078697e770e.tar.gz
android_packages_apps_Camera2-96dbd9182b09979bb900af58d4a02078697e770e.tar.bz2
android_packages_apps_Camera2-96dbd9182b09979bb900af58d4a02078697e770e.zip
Camera2: Only autofocus before a snap if we are actually in "auto" mode.
Original commit by cyanogen 7daaa72d35c1f8820117768e4b129acd030bcefb Change-Id: I51853913f6459b599176910f7f486f59972eaf36
-rw-r--r--src/com/android/camera/FocusOverlayManager.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java
index 4e4d54c7e..7357a95b3 100644
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -652,8 +652,6 @@ public class FocusOverlayManager implements PreviewStatusListener.PreviewAreaCha
}
private boolean needAutoFocusCall(CameraCapabilities.FocusMode focusMode) {
- return !(focusMode == CameraCapabilities.FocusMode.INFINITY
- || focusMode == CameraCapabilities.FocusMode.FIXED
- || focusMode == CameraCapabilities.FocusMode.EXTENDED_DOF);
+ return focusMode == CameraCapabilities.FocusMode.AUTO;
}
}