From ea49f4b4ba9d182fd8a74c74d16590cb65f3a5f1 Mon Sep 17 00:00:00 2001 From: Ziv Hendel Date: Thu, 21 Mar 2013 03:25:32 +0200 Subject: commandStartFaceDetectionL returned the wrong value when face detection is not supported by the HAL. This caused the JNI function to fail since it expected a BAD_VALUE response in that case. Change-Id: I53107a3958d541c25930b81eda638d4b6a394254 Signed-off-by: Igor Murashkin --- services/camera/libcameraservice/Camera2Client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp index 056271d..d3adbdc 100644 --- a/services/camera/libcameraservice/Camera2Client.cpp +++ b/services/camera/libcameraservice/Camera2Client.cpp @@ -1255,7 +1255,7 @@ status_t Camera2Client::commandStartFaceDetectionL(int /*type*/) { ANDROID_STATISTICS_FACE_DETECT_MODE_OFF) { ALOGE("%s: Camera %d: Face detection not supported", __FUNCTION__, mCameraId); - return INVALID_OPERATION; + return BAD_VALUE; } if (l.mParameters.enableFaceDetect) return OK; -- cgit v1.1 From b08a63931f22a1e934b32e8fb8de9ab4877d5258 Mon Sep 17 00:00:00 2001 From: Igor Murashkin Date: Thu, 21 Mar 2013 11:19:00 -0700 Subject: Camera2: getSceneMode should return NULL when there are no supported scene modes Bug: 8444806 Change-Id: Ic92924ceda3de738a7971605552baf00a4fc0546 --- services/camera/libcameraservice/camera2/Parameters.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp index 859e2e9..d13fe8b 100644 --- a/services/camera/libcameraservice/camera2/Parameters.cpp +++ b/services/camera/libcameraservice/camera2/Parameters.cpp @@ -534,6 +534,8 @@ status_t Parameters::initialize(const CameraMetadata *info) { if (!noSceneModes) { params.set(CameraParameters::KEY_SUPPORTED_SCENE_MODES, supportedSceneModes); + } else { + params.remove(CameraParameters::KEY_SCENE_MODE); } } -- cgit v1.1