am cd2433f3: fix[2222341] Soft reset while going back from camcorder settings

Merge commit 'cd2433f3804a537aedc26f595b1c05f95a05244a' into eclair-mr2

* commit 'cd2433f3804a537aedc26f595b1c05f95a05244a':
  fix[2222341] Soft reset while going back from camcorder settings
This commit is contained in:
Mathias Agopian 2009-10-30 14:59:05 -07:00 committed by Android Git Automerger
commit 5a5d4ad61b

View file

@ -75,6 +75,14 @@ enum {
typedef const native_handle* buffer_handle_t;
enum {
/* FIXME: this only exists to work-around some issues with
* the video and camera frameworks. don't implement unless
* you know what you're doing.
*/
GRALLOC_MODULE_PERFORM_CREATE_HANDLE_FROM_BUFFER = 0x080000001,
};
/**
* Every hardware module must have a data structure named HAL_MODULE_INFO_SYM
* and the fields of this data structure must begin with hw_module_t
@ -83,7 +91,6 @@ typedef const native_handle* buffer_handle_t;
typedef struct gralloc_module_t {
struct hw_module_t common;
/*
* (*registerBuffer)() must be called before a buffer_handle_t that has not
* been created with (*alloc_device_t::alloc)() can be used.
@ -162,8 +169,13 @@ typedef struct gralloc_module_t {
int (*unlock)(struct gralloc_module_t const* module,
buffer_handle_t handle);
/* reserved for future use */
void* reserved_proc[8];
int (*perform)(struct gralloc_module_t const* module,
int operation, ... );
/* reserved for future use */
void* reserved_proc[7];
} gralloc_module_t;
/*****************************************************************************/