diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-08-26 14:44:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-26 14:44:46 -0700 |
| commit | 43a2bbb9de4f51754b7b131fc282aa2f9115c09e (patch) | |
| tree | 644cbaca62e7d4ce522c5ed6ada121527f1ae7f6 /include | |
| parent | f186f98fb02182366b499ba1b9cbbed537bdedba (diff) | |
| parent | dde2a9d4b5129fa836d211a75f0040bf552c94c9 (diff) | |
| download | hardware_libhardware-43a2bbb9de4f51754b7b131fc282aa2f9115c09e.zip hardware_libhardware-43a2bbb9de4f51754b7b131fc282aa2f9115c09e.tar.gz hardware_libhardware-43a2bbb9de4f51754b7b131fc282aa2f9115c09e.tar.bz2 | |
Merge "Revert "Camera2: Make static_camera_characteristics const."" into jb-mr1-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/hardware/camera_common.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/hardware/camera_common.h b/include/hardware/camera_common.h index 5697bda..5459b6c 100644 --- a/include/hardware/camera_common.h +++ b/include/hardware/camera_common.h @@ -135,9 +135,7 @@ struct camera_info { /** * The camera's fixed characteristics, which include all camera metadata in - * the android.*.info.* sections. This should be a sorted metadata buffer, - * and may not be modified or freed by the caller. The pointer should remain - * valid for the lifetime of the camera module. + * the android.*.info.* sections. * * Version information (based on camera_module_t.common.module_api_version): * @@ -152,7 +150,7 @@ struct camera_info { * otherwise. * */ - const camera_metadata_t *static_camera_characteristics; + camera_metadata_t *static_camera_characteristics; }; typedef struct camera_module { |