diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-04-16 16:24:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-16 16:25:05 +0000 |
| commit | 7771e6c52188dae295524088e577b0db64869b17 (patch) | |
| tree | 54b11ccd3199422925db2ac5f8c5de43fe21c553 /modules | |
| parent | 7779bc003836b4edc21c65e40f2193ec863c1b18 (diff) | |
| parent | aee4782839de3103ecebca830a6bd49263a37ad3 (diff) | |
| download | hardware_libhardware-7771e6c52188dae295524088e577b0db64869b17.zip hardware_libhardware-7771e6c52188dae295524088e577b0db64869b17.tar.gz hardware_libhardware-7771e6c52188dae295524088e577b0db64869b17.tar.bz2 | |
Merge "Camera: Add HAL module init method."
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/camera/CameraHAL.cpp | 1 | ||||
| -rw-r--r-- | modules/usbcamera/CameraHAL.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/modules/camera/CameraHAL.cpp b/modules/camera/CameraHAL.cpp index 06f308f..62ee6d4 100644 --- a/modules/camera/CameraHAL.cpp +++ b/modules/camera/CameraHAL.cpp @@ -186,6 +186,7 @@ camera_module_t HAL_MODULE_INFO_SYM __attribute__ ((visibility("default"))) = { get_vendor_tag_ops : get_vendor_tag_ops, open_legacy : NULL, set_torch_mode : NULL, + init : NULL, reserved : {0}, }; } // extern "C" diff --git a/modules/usbcamera/CameraHAL.cpp b/modules/usbcamera/CameraHAL.cpp index 98111ef..652e937 100644 --- a/modules/usbcamera/CameraHAL.cpp +++ b/modules/usbcamera/CameraHAL.cpp @@ -147,6 +147,7 @@ camera_module_t HAL_MODULE_INFO_SYM __attribute__ ((visibility("default"))) = { get_vendor_tag_ops : NULL, open_legacy : NULL, set_torch_mode : NULL, + init : NULL, reserved : {0}, }; } // extern "C" |