diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2015-07-01 20:00:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-01 20:00:09 +0000 |
| commit | 164563fe0afbb69eb7474fc99b2852680b74f171 (patch) | |
| tree | d4b778866772d9955262a0ba7d6c75467f05f4b3 /camera/include/system/camera_metadata_tags.h | |
| parent | 07fba8848de01c7b811eae76b813865dac21cd36 (diff) | |
| parent | 93192944359dd503c799cfbb4a9de46edfaf5eae (diff) | |
| download | android_system_media-164563fe0afbb69eb7474fc99b2852680b74f171.tar.gz android_system_media-164563fe0afbb69eb7474fc99b2852680b74f171.tar.bz2 android_system_media-164563fe0afbb69eb7474fc99b2852680b74f171.zip | |
Merge "camera2: Fix ABI for new tags." into mnc-dev
Diffstat (limited to 'camera/include/system/camera_metadata_tags.h')
| -rw-r--r-- | camera/include/system/camera_metadata_tags.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/camera/include/system/camera_metadata_tags.h b/camera/include/system/camera_metadata_tags.h index 0585701c..aa60de7a 100644 --- a/camera/include/system/camera_metadata_tags.h +++ b/camera/include/system/camera_metadata_tags.h @@ -311,8 +311,6 @@ typedef enum camera_metadata_tag { ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE = // int32[] | public ANDROID_SENSOR_INFO_START, - ANDROID_SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE, - // int32[] | public ANDROID_SENSOR_INFO_SENSITIVITY_RANGE, // int32[] | public ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT, // enum | public ANDROID_SENSOR_INFO_EXPOSURE_TIME_RANGE, // int64[] | public @@ -322,6 +320,8 @@ typedef enum camera_metadata_tag { ANDROID_SENSOR_INFO_WHITE_LEVEL, // int32 | public ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE, // enum | public ANDROID_SENSOR_INFO_LENS_SHADING_APPLIED, // enum | public + ANDROID_SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE, + // int32[] | public ANDROID_SENSOR_INFO_END, ANDROID_SHADING_MODE = // enum | public |