summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-05-01 18:32:14 -0400
committerMichael Bestas <mkbestas@lineageos.org>2019-09-10 22:43:11 +0300
commitcdaf0ed0d6c7e035e084ebdd789dc2423021ccfc (patch)
treee11521a7d6cf116b1c5766ce9df735b18e54964c
parentf4927f5a8c03e8c8a08cf99941cce705442b703c (diff)
downloadandroid_packages_apps_Camera2-cdaf0ed0d6c7e035e084ebdd789dc2423021ccfc.tar.gz
android_packages_apps_Camera2-cdaf0ed0d6c7e035e084ebdd789dc2423021ccfc.tar.bz2
android_packages_apps_Camera2-cdaf0ed0d6c7e035e084ebdd789dc2423021ccfc.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 c16d01b39..72d6f4393 100644
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -584,8 +584,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;
}
}