summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorZiv Hendel <ziv@primesense.com>2013-03-21 03:25:32 +0200
committerIgor Murashkin <iam@google.com>2013-03-21 11:32:06 -0700
commitcaf3a9c1447f602c658f558025b90413d1b4114d (patch)
tree799a8159071e3fc652f47c0b4b211bf39476b580 /services
parent96954c00cc8887f216ba84e126ab4a1100f348b4 (diff)
downloadframeworks_av-caf3a9c1447f602c658f558025b90413d1b4114d.zip
frameworks_av-caf3a9c1447f602c658f558025b90413d1b4114d.tar.gz
frameworks_av-caf3a9c1447f602c658f558025b90413d1b4114d.tar.bz2
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 <iam@google.com>
Diffstat (limited to 'services')
-rw-r--r--services/camera/libcameraservice/Camera2Client.cpp2
1 files changed, 1 insertions, 1 deletions
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;