commit c8b1ea7d778ec69e8b98cb9dca39d2416fae1507
author Eino-Ville Talvala <etalvala@google.com> Thu May 10 11:57:01 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 10 11:57:01 2012 -0700
tree 09dd9f89adb07cd67907d0602125adf82b1744ed
parent 5d38fd13d02f665d8c12579b3d952148036edd5f
parent 919f3623e9c471f2cd80ef4f96bbaa43a0ed3b28

am 919f3623: am 67fb73f5: Merge "Camera: Document expected error codes for start face detect." into jb-dev

* commit '919f3623e9c471f2cd80ef4f96bbaa43a0ed3b28':
  Camera: Document expected error codes for start face detect.

include/system/camera.h

diff --git a/include/system/camera.h b/include/system/camera.h
index b8389b1..e4cacc5 100644
--- a/include/system/camera.h
+++ b/include/system/camera.h
@@ -137,7 +137,8 @@
      * KEY_FOCUS_AREAS and KEY_METERING_AREAS have no effect.
      *
      * arg1 is the face detection type. It can be CAMERA_FACE_DETECTION_HW or
-     * CAMERA_FACE_DETECTION_SW.
+     * CAMERA_FACE_DETECTION_SW. If the type of face detection requested is not
+     * supported, the HAL must return BAD_VALUE.
      */
     CAMERA_CMD_START_FACE_DETECTION = 6,