summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergii Piatakov <sergii.piatakov@globallogic.com>2018-08-03 18:03:44 +0300
committerSergii Piatakov <sergii.piatakov@globallogic.com>2018-08-10 14:37:02 +0300
commit4d3eb7a33f64473e432b38a34dfc8921cb1a8d21 (patch)
treea80a418172a29e97aa936c562fe2524e4f4bf19b
parenta01d1f82332389737d9f1f77e9705c9bdde17ef7 (diff)
downloadlibhardware-4d3eb7a33f64473e432b38a34dfc8921cb1a8d21.tar.gz
camera: fix `-Wunused-parameter` compiler warnings
Test: add `USE_CAMERA_V4L2_HAL := true` to hardware/libhardware/modules/camera/3_4/Android.mk and build mmm hardware/libhardware/modules/camera/3_4 Change-Id: I1bfd688902c78fe69bfbee3bacc73c25a5ef6c5c Signed-off-by: Sergii Piatakov <sergii.piatakov@globallogic.com>
-rw-r--r--modules/camera/3_4/metadata/ignored_control_delegate.h2
-rw-r--r--modules/camera/3_4/metadata/property.h8
-rw-r--r--modules/camera/3_4/metadata/state.h10
-rw-r--r--modules/camera/3_4/v4l2_camera_hal.cpp12
4 files changed, 16 insertions, 16 deletions
diff --git a/modules/camera/3_4/metadata/ignored_control_delegate.h b/modules/camera/3_4/metadata/ignored_control_delegate.h
index f1d5da1b..dce457b1 100644
--- a/modules/camera/3_4/metadata/ignored_control_delegate.h
+++ b/modules/camera/3_4/metadata/ignored_control_delegate.h
@@ -32,7 +32,7 @@ class IgnoredControlDelegate : public ControlDelegateInterface<T> {
*value = value_;
return 0;
};
- int SetValue(const T& value) override { return 0; };
+ int SetValue(const T& /*value*/) override { return 0; };
private:
const T value_;
diff --git a/modules/camera/3_4/metadata/property.h b/modules/camera/3_4/metadata/property.h
index 6884c7dd..6a542b28 100644
--- a/modules/camera/3_4/metadata/property.h
+++ b/modules/camera/3_4/metadata/property.h
@@ -41,22 +41,22 @@ class Property : public PartialMetadataInterface {
};
virtual int PopulateDynamicFields(
- android::CameraMetadata* metadata) const override {
+ android::CameraMetadata* /*metadata*/) const override {
return 0;
};
virtual int PopulateTemplateRequest(
- int template_type, android::CameraMetadata* metadata) const override {
+ int /*template_type*/, android::CameraMetadata* /*metadata*/) const override {
return 0;
};
virtual bool SupportsRequestValues(
- const android::CameraMetadata& metadata) const override {
+ const android::CameraMetadata& /*metadata*/) const override {
return true;
};
virtual int SetRequestValues(
- const android::CameraMetadata& metadata) override {
+ const android::CameraMetadata& /*metadata*/) override {
return 0;
};
diff --git a/modules/camera/3_4/metadata/state.h b/modules/camera/3_4/metadata/state.h
index 54f66e47..13f2ea5f 100644
--- a/modules/camera/3_4/metadata/state.h
+++ b/modules/camera/3_4/metadata/state.h
@@ -54,7 +54,7 @@ class State : public PartialMetadataInterface {
// -----------------------------------------------------------------------------
template <typename T>
-int State<T>::PopulateStaticFields(android::CameraMetadata* metadata) const {
+int State<T>::PopulateStaticFields(android::CameraMetadata* /*metadata*/) const {
HAL_LOG_ENTER();
return 0;
}
@@ -72,21 +72,21 @@ int State<T>::PopulateDynamicFields(android::CameraMetadata* metadata) const {
};
template <typename T>
-int State<T>::PopulateTemplateRequest(int template_type,
- android::CameraMetadata* metadata) const {
+int State<T>::PopulateTemplateRequest(int /*template_type*/,
+ android::CameraMetadata* /*metadata*/) const {
HAL_LOG_ENTER();
return 0;
};
template <typename T>
bool State<T>::SupportsRequestValues(
- const android::CameraMetadata& metadata) const {
+ const android::CameraMetadata& /*metadata*/) const {
HAL_LOG_ENTER();
return true;
};
template <typename T>
-int State<T>::SetRequestValues(const android::CameraMetadata& metadata) {
+int State<T>::SetRequestValues(const android::CameraMetadata& /*metadata*/) {
HAL_LOG_ENTER();
return 0;
};
diff --git a/modules/camera/3_4/v4l2_camera_hal.cpp b/modules/camera/3_4/v4l2_camera_hal.cpp
index 8ff8e5d2..d53b5d75 100644
--- a/modules/camera/3_4/v4l2_camera_hal.cpp
+++ b/modules/camera/3_4/v4l2_camera_hal.cpp
@@ -134,22 +134,22 @@ int V4L2CameraHAL::setCallbacks(const camera_module_callbacks_t* callbacks) {
return 0;
}
-void V4L2CameraHAL::getVendorTagOps(vendor_tag_ops_t* ops) {
+void V4L2CameraHAL::getVendorTagOps(vendor_tag_ops_t* /*ops*/) {
HAL_LOG_ENTER();
// No vendor ops for this HAL. From <hardware/camera_common.h>:
// "leave ops unchanged if no vendor tags are defined."
}
-int V4L2CameraHAL::openLegacy(const hw_module_t* module,
- const char* id,
- uint32_t halVersion,
- hw_device_t** device) {
+int V4L2CameraHAL::openLegacy(const hw_module_t* /*module*/,
+ const char* /*id*/,
+ uint32_t /*halVersion*/,
+ hw_device_t** /*device*/) {
HAL_LOG_ENTER();
// Not supported.
return -ENOSYS;
}
-int V4L2CameraHAL::setTorchMode(const char* camera_id, bool enabled) {
+int V4L2CameraHAL::setTorchMode(const char* /*camera_id*/, bool /*enabled*/) {
HAL_LOG_ENTER();
// TODO(b/29158098): HAL is required to respond appropriately if
// the desired camera actually does support flash.