diff options
| author | Igor Murashkin <iam@google.com> | 2013-09-12 18:21:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-12 18:21:15 +0000 |
| commit | 0747b8cdde87301ea75a94536adc3f86f793d9b6 (patch) | |
| tree | 03d91f666ea1e190c2852eefff2ba78fe62573c9 | |
| parent | 0702575fea9e820c8d52736da7542117b02bf679 (diff) | |
| parent | 0e323a10780a53b10cf5e222bb0332276b0487a9 (diff) | |
| download | android_system_media-0747b8cdde87301ea75a94536adc3f86f793d9b6.tar.gz android_system_media-0747b8cdde87301ea75a94536adc3f86f793d9b6.tar.bz2 android_system_media-0747b8cdde87301ea75a94536adc3f86f793d9b6.zip | |
Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev
| -rw-r--r-- | camera/docs/docs.html | 3 | ||||
| -rw-r--r-- | camera/docs/metadata_properties.xml | 1 | ||||
| -rw-r--r-- | camera/include/system/camera_metadata_tags.h | 1 | ||||
| -rw-r--r-- | camera/src/camera_metadata_tag_info.c | 4 |
4 files changed, 9 insertions, 0 deletions
diff --git a/camera/docs/docs.html b/camera/docs/docs.html index 8b1b233e..e0aaf81d 100644 --- a/camera/docs/docs.html +++ b/camera/docs/docs.html @@ -6139,6 +6139,9 @@ <li> <span class="entry_type_enum_name">STATIONARY</span> </li> + <li> + <span class="entry_type_enum_name">MOVING</span> + </li> </ul> </td> <!-- entry_type --> diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml index a14576bc..a9463cd3 100644 --- a/camera/docs/metadata_properties.xml +++ b/camera/docs/metadata_properties.xml @@ -1393,6 +1393,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata <entry name="state" type="byte" visibility="public" enum="true"> <enum> <value>STATIONARY</value> + <value>MOVING</value> </enum> <description>Current lens status</description> <tag id="V1" /> diff --git a/camera/include/system/camera_metadata_tags.h b/camera/include/system/camera_metadata_tags.h index ab92dd14..df53878c 100644 --- a/camera/include/system/camera_metadata_tags.h +++ b/camera/include/system/camera_metadata_tags.h @@ -573,6 +573,7 @@ typedef enum camera_metadata_enum_android_lens_facing { // ANDROID_LENS_STATE typedef enum camera_metadata_enum_android_lens_state { ANDROID_LENS_STATE_STATIONARY, + ANDROID_LENS_STATE_MOVING, } camera_metadata_enum_android_lens_state_t; diff --git a/camera/src/camera_metadata_tag_info.c b/camera/src/camera_metadata_tag_info.c index 80fe3ce1..a84ec09c 100644 --- a/camera/src/camera_metadata_tag_info.c +++ b/camera/src/camera_metadata_tag_info.c @@ -1358,6 +1358,10 @@ int camera_metadata_enum_snprint(uint32_t tag, msg = "STATIONARY"; ret = 0; break; + case ANDROID_LENS_STATE_MOVING: + msg = "MOVING"; + ret = 0; + break; default: msg = "error: enum value out of range"; } |