universal7580: camera: fix compiler warnings in wrapper

Change-Id: Iaecd86986ebbcbe3d6d1130b2b31a772d61949b6

diff --git a/camera/Camera2Wrapper.cpp b/camera/Camera2Wrapper.cpp
index 2fa813d1a84d1f95d1ec2a8a7ae89ff016727b03..d4dc35f2245b742d1733ef4c226632c2167c37b7 100644 (file)
--- a/camera/Camera2Wrapper.cpp
+++ b/camera/Camera2Wrapper.cpp
@@ -58,12 +58,7 @@ static int check_vendor_module()
  * Camera2 wrapper fixup functions
  *******************************************************************/
 
-static char * camera2_fixup_getparams(int id __unused, const char * settings)
-{
-    bool videoMode = false;
-    const char* isoMode;
-    char *manipBuf;
-
+static char * camera2_fixup_getparams(int id __unused, const char * settings) {
     android::CameraParameters params;
     params.unflatten(android::String8(settings));
 
@@ -83,11 +78,7 @@ static char * camera2_fixup_getparams(int id __unused, const char * settings)
     return ret;
 }
 
-static char * camera2_fixup_setparams(int id __unused, const char * settings)
-{
-    bool videoMode = false;
-    const char* isoMode;
-
+static char * camera2_fixup_setparams(int id __unused, const char * settings) {
     android::CameraParameters params;
     params.unflatten(android::String8(settings));
 

diff --git a/camera/CameraWrapper.cpp b/camera/CameraWrapper.cpp
index 82e941efb4162ddd4b59178facf3ca7683db8641..8dcf5c2742c355b15d2497a9e8cc9618edde7142 100644 (file)
--- a/camera/CameraWrapper.cpp
+++ b/camera/CameraWrapper.cpp
@@ -23,6 +23,15 @@
 #include "CameraWrapper.h"
 #include "Camera2Wrapper.h"
 
+static int camera_device_open(const hw_module_t* module, const char* name,
+                hw_device_t** device);
+static int camera_get_number_of_cameras(void);
+static int camera_get_camera_info(int camera_id, struct camera_info *info);
+static int camera_set_callbacks(const camera_module_callbacks_t *callbacks);
+static void camera_get_vendor_tag_ops(vendor_tag_ops_t* ops);
+static int camera_open_legacy(const struct hw_module_t* module, const char* id, uint32_t halVersion, struct hw_device_t** device);
+static int camera_set_torch_mode(const char* camera_id, bool enabled);
+
 static camera_module_t *gVendorModule = 0;
 
 static int check_vendor_module()
@@ -113,6 +122,7 @@ static void camera_get_vendor_tag_ops(vendor_tag_ops_t* ops)
 
 static int camera_open_legacy(const struct hw_module_t* module, const char* id, uint32_t halVersion, struct hw_device_t** device)
 {
+    (void)halVersion;
     ALOGV("%s", __FUNCTION__);
     if (check_vendor_module())
         return 0;

diff --git a/camera/CameraWrapper.h b/camera/CameraWrapper.h
index 34e099fae0c31376f33ef09ead31d7b09a3a25ff..d9aeb9964963d2cb7691b7f6d44c511c18fddfe3 100644 (file)
--- a/camera/CameraWrapper.h
+++ b/camera/CameraWrapper.h
@@ -23,12 +23,3 @@
 
 static android::Mutex gCameraWrapperLock;
 
-static int camera_device_open(const hw_module_t* module, const char* name,
-                hw_device_t** device);
-static int camera_device_close(hw_device_t* device);
-static int camera_get_number_of_cameras(void);
-static int camera_get_camera_info(int camera_id, struct camera_info *info);
-static int camera_set_callbacks(const camera_module_callbacks_t *callbacks);
-static void camera_get_vendor_tag_ops(vendor_tag_ops_t* ops);
-static int camera_open_legacy(const struct hw_module_t* module, const char* id, uint32_t halVersion, struct hw_device_t** device);
-static int camera_set_torch_mode(const char* camera_id, bool enabled);