diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-08-26 14:44:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-26 14:44:38 -0700 |
| commit | dde2a9d4b5129fa836d211a75f0040bf552c94c9 (patch) | |
| tree | 483225aa0dd123a84bf5f2219a3bf93d104e19d0 /include | |
| parent | d959ec5297c19b9b8f1760c9237030bf931b5803 (diff) | |
| download | hardware_libhardware-dde2a9d4b5129fa836d211a75f0040bf552c94c9.zip hardware_libhardware-dde2a9d4b5129fa836d211a75f0040bf552c94c9.tar.gz hardware_libhardware-dde2a9d4b5129fa836d211a75f0040bf552c94c9.tar.bz2 | |
Revert "Camera2: Make static_camera_characteristics const."
Needs a third change that's not yet done with review.
This reverts commit c9ec8a656b59912f496880d3a63c0decd490f09d
Change-Id: Ic3e465e1308cbf107a250ec17b73a59a35e52f9f
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 { |