summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorqimengp <qimengp@codeaurora.org>2016-12-15 16:17:17 +0800
committerArne Coucheron <arco68@gmail.com>2017-06-13 07:16:29 +0200
commita5054be425369aa6db59e3a6b900db31a0bd3896 (patch)
tree9ff5e13e784a6a7f69ae3e7399644402305c26e0
parent975aecad9b4c62ce340db502fa9931cae106b82d (diff)
downloadandroid_packages_apps_Snap-a5054be425369aa6db59e3a6b900db31a0bd3896.zip
android_packages_apps_Snap-a5054be425369aa6db59e3a6b900db31a0bd3896.tar.gz
android_packages_apps_Snap-a5054be425369aa6db59e3a6b900db31a0bd3896.tar.bz2
SnapdragonCamera: Fix capture with flash will get black image.
Remove CONTROL_AF_STATE_PASSIVE_FOCUSED to make sure AF is ready Change-Id: I581480e5a3f1a40062140eeed0c26d769c60e4db
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 6242fe4..a0243cd 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -544,8 +544,6 @@ public class CaptureModule extends BaseModule<CaptureUI> implements PhotoControl
// AF_PASSIVE is added for continous auto focus mode
if (CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED == afState ||
CaptureResult.CONTROL_AF_STATE_NOT_FOCUSED_LOCKED == afState ||
- CaptureResult.CONTROL_AF_STATE_PASSIVE_FOCUSED == afState ||
- CaptureResult.CONTROL_AF_STATE_PASSIVE_UNFOCUSED == afState ||
(mLockRequestHashCode[id] == result.getRequest().hashCode() &&
afState == CaptureResult.CONTROL_AF_STATE_INACTIVE)) {
if(id == MONO_ID && getCameraMode() == DUAL_MODE && isBackCamera()) {