summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-05-01 18:32:14 -0400
committerMichael Bestas <mikeioannina@gmail.com>2016-12-30 17:17:51 +0200
commit06f6ad41b4ce76d476601848ff8d80e7bcacaf1f (patch)
tree4d4b11a3c9a9aed61cc99c9b5fe70d35076ec3a1
parent9553865bed95092719c0041e6c96ac14890522cb (diff)
downloadandroid_packages_apps_Camera2-06f6ad41b4ce76d476601848ff8d80e7bcacaf1f.tar.gz
android_packages_apps_Camera2-06f6ad41b4ce76d476601848ff8d80e7bcacaf1f.tar.bz2
android_packages_apps_Camera2-06f6ad41b4ce76d476601848ff8d80e7bcacaf1f.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;
}
}