summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-05-01 18:32:14 -0400
committerDave Daynard <nardholio@gmail.com>2015-10-13 23:14:18 -0400
commitc8eccde6d80347ae16e487998179e45b9866d067 (patch)
tree65f53c3d937e3b27ea7ede0c180e18f273ef9f6d /src
parent7e4851ff7e0ece777432d3579de82bf24a91f08d (diff)
downloadandroid_packages_apps_Camera2-c8eccde6d80347ae16e487998179e45b9866d067.tar.gz
android_packages_apps_Camera2-c8eccde6d80347ae16e487998179e45b9866d067.tar.bz2
android_packages_apps_Camera2-c8eccde6d80347ae16e487998179e45b9866d067.zip
Camera2: Only autofocus before a snap if we are actually in "auto" mode.
Original commit by cyanogen 7daaa72d35c1f8820117768e4b129acd030bcefb Change-Id: I51853913f6459b599176910f7f486f59972eaf36
Diffstat (limited to 'src')
-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;
}
}