summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--services/camera/libcameraservice/Camera2Client.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp
index c48aa22..66d8a50 100644
--- a/services/camera/libcameraservice/Camera2Client.cpp
+++ b/services/camera/libcameraservice/Camera2Client.cpp
@@ -2010,7 +2010,11 @@ status_t Camera2Client::processFrameFaceDetect(camera_metadata_t *frame) {
}
res = find_camera_metadata_entry(frame, ANDROID_STATS_FACE_DETECT_MODE,
&entry);
- if (res != OK) {
+ // TODO: Remove this check once things are more compliant. For now, assume that
+ // if we can't find the face detect mode, then it's probably not working.
+ if (res == NAME_NOT_FOUND) {
+ return OK;
+ } else if (res != OK) {
ALOGE("%s: Camera %d: Error reading face mode: %s (%d)",
__FUNCTION__, mCameraId, strerror(-res), res);
return res;