From dde2a9d4b5129fa836d211a75f0040bf552c94c9 Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Sun, 26 Aug 2012 14:44:38 -0700 Subject: 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 --- include/hardware/camera_common.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'include') 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 { -- cgit v1.1