From 5f0714eb039c07554bef6ec289c70ed1164fdf52 Mon Sep 17 00:00:00 2001 From: Igor Murashkin Date: Mon, 8 Oct 2012 18:05:12 -0700 Subject: Camera2: Call onAutoFocus immediately for fixed-focus cameras Bug: 7311578 Change-Id: Ib8a8ea1f5fc269abdd24ed1e0370dc9b87b284ee --- services/camera/libcameraservice/Camera2Client.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'services') diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp index e073e39..7a6e344 100644 --- a/services/camera/libcameraservice/Camera2Client.cpp +++ b/services/camera/libcameraservice/Camera2Client.cpp @@ -959,6 +959,21 @@ status_t Camera2Client::autoFocus() { return INVALID_OPERATION; } + /** + * If the camera does not support auto-focus, it is a no-op and + * onAutoFocus(boolean, Camera) callback will be called immediately + * with a fake value of success set to true. + */ + if (l.mParameters.focusMode == Parameters::FOCUS_MODE_FIXED) { + SharedCameraClient::Lock l(mSharedCameraClient); + if (l.mCameraClient != 0) { + l.mCameraClient->notifyCallback(CAMERA_MSG_FOCUS, + /*success*/1, 0); + } + + return OK; + } + if (l.mParameters.quirks.triggerAfWithAuto && l.mParameters.sceneMode != ANDROID_CONTROL_SCENE_MODE_UNSUPPORTED && l.mParameters.focusMode != Parameters::FOCUS_MODE_AUTO) { -- cgit v1.1