Remove spurious logging.
When logging was enabled, the log was a little *too*
verbose, making it unreadable. Removing some of the
more frequently hit log messages.
BUG: b/32942120
TEST: Can run camera samples
Change-Id: I136c20279699e4c87b3ef1c3042b88c20c301002
diff --git a/modules/camera/3_4/metadata/control.h b/modules/camera/3_4/metadata/control.h
index 6442f90..ed86d39 100644
--- a/modules/camera/3_4/metadata/control.h
+++ b/modules/camera/3_4/metadata/control.h
@@ -64,9 +64,7 @@
template <typename T>
Control<T>::Control(std::unique_ptr<TaggedControlDelegate<T>> delegate,
std::unique_ptr<TaggedControlOptions<T>> options)
- : delegate_(std::move(delegate)), options_(std::move(options)) {
- HAL_LOG_ENTER();
-}
+ : delegate_(std::move(delegate)), options_(std::move(options)) {}
template <typename T>
std::vector<int32_t> Control<T>::StaticTags() const {
@@ -89,8 +87,6 @@
template <typename T>
int Control<T>::PopulateStaticFields(android::CameraMetadata* metadata) const {
- HAL_LOG_ENTER();
-
if (!options_) {
HAL_LOGV("No options for control, nothing to populate.");
return 0;
@@ -102,8 +98,6 @@
template <typename T>
int Control<T>::PopulateDynamicFields(android::CameraMetadata* metadata) const {
- HAL_LOG_ENTER();
-
// Populate the current setting.
T value;
int res = delegate_->GetValue(&value);
@@ -116,8 +110,6 @@
template <typename T>
int Control<T>::PopulateTemplateRequest(
int template_type, android::CameraMetadata* metadata) const {
- HAL_LOG_ENTER();
-
// Populate with a default.
T value;
int res;
@@ -138,7 +130,6 @@
template <typename T>
bool Control<T>::SupportsRequestValues(
const android::CameraMetadata& metadata) const {
- HAL_LOG_ENTER();
if (metadata.isEmpty()) {
// Implicitly supported.
return true;
@@ -167,7 +158,6 @@
template <typename T>
int Control<T>::SetRequestValues(const android::CameraMetadata& metadata) {
- HAL_LOG_ENTER();
if (metadata.isEmpty()) {
// No changes necessary.
return 0;
diff --git a/modules/camera/3_4/metadata/enum_converter.cpp b/modules/camera/3_4/metadata/enum_converter.cpp
index f4c9819..d5e0a87 100644
--- a/modules/camera/3_4/metadata/enum_converter.cpp
+++ b/modules/camera/3_4/metadata/enum_converter.cpp
@@ -29,8 +29,6 @@
}
int EnumConverter::MetadataToV4L2(uint8_t value, int32_t* conversion) {
- HAL_LOG_ENTER();
-
// Unfortunately no bi-directional map lookup in C++.
// Breaking on second, not first found so that a warning
// can be given if there are multiple values.
@@ -60,8 +58,6 @@
}
int EnumConverter::V4L2ToMetadata(int32_t value, uint8_t* conversion) {
- HAL_LOG_ENTER();
-
auto element_range = v4l2_to_metadata_.equal_range(value);
if (element_range.first == element_range.second) {
HAL_LOGV("Couldn't find metadata conversion of V4L2 value %d.", value);
diff --git a/modules/camera/3_4/metadata/property.h b/modules/camera/3_4/metadata/property.h
index 03da434..6884c7d 100644
--- a/modules/camera/3_4/metadata/property.h
+++ b/modules/camera/3_4/metadata/property.h
@@ -37,31 +37,26 @@
virtual int PopulateStaticFields(
android::CameraMetadata* metadata) const override {
- HAL_LOG_ENTER();
return UpdateMetadata(metadata, tag_, value_);
};
virtual int PopulateDynamicFields(
android::CameraMetadata* metadata) const override {
- HAL_LOG_ENTER();
return 0;
};
virtual int PopulateTemplateRequest(
int template_type, android::CameraMetadata* metadata) const override {
- HAL_LOG_ENTER();
return 0;
};
virtual bool SupportsRequestValues(
const android::CameraMetadata& metadata) const override {
- HAL_LOG_ENTER();
return true;
};
virtual int SetRequestValues(
const android::CameraMetadata& metadata) override {
- HAL_LOG_ENTER();
return 0;
};