diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-05-10 10:21:04 -0700 | 
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-10 10:21:04 -0700 | 
| commit | 67fb73f5d5eaa089b63018f55f980631c9ba6749 (patch) | |
| tree | 9236eb5593db6be7988274657732919cb4ec94c8 /include/system | |
| parent | 4fd375b566f0a4536b0afd8a2e4bd1c573a082c9 (diff) | |
| parent | 58cfa8af0ef6ff541a638756866427aced483943 (diff) | |
| download | system_core-67fb73f5d5eaa089b63018f55f980631c9ba6749.zip system_core-67fb73f5d5eaa089b63018f55f980631c9ba6749.tar.gz system_core-67fb73f5d5eaa089b63018f55f980631c9ba6749.tar.bz2 | |
Merge "Camera: Document expected error codes for start face detect." into jb-dev
Diffstat (limited to 'include/system')
| -rw-r--r-- | include/system/camera.h | 3 | 
1 files changed, 2 insertions, 1 deletions
| 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 @@ enum {       * 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, | 
