commit 5d7532337a245450434203c5a6cf67005a001208
author Ari Hausman-Cohen <arihc@google.com> Wed Aug 10 14:27:36 2016 -0700
committer Ari Hausman-Cohen <arihc@google.com> Wed Aug 10 14:27:36 2016 -0700
tree b58e552d2f4782aa6c2baeae07ebbb6668398674
parent c7abfe744834507eed30f28bfb97a3849956d66f

Style fixes.

Was previously running the clang-format command incorrectly;
was not using the .clang-format file, and so was formatting
in some different style.

Change-Id: I09e81b919d1e6d40a56eb4f3f519aaed281a0c86
TEST: unit tests pass

modules/camera/3_4/metadata/metadata.cpp

diff --git a/modules/camera/3_4/metadata/metadata.cpp b/modules/camera/3_4/metadata/metadata.cpp
index 0d03d5f..61336fe 100644
--- a/modules/camera/3_4/metadata/metadata.cpp
+++ b/modules/camera/3_4/metadata/metadata.cpp
@@ -22,9 +22,13 @@
 
 namespace v4l2_camera_hal {
 
-Metadata::Metadata() { HAL_LOG_ENTER(); }
+Metadata::Metadata() {
+  HAL_LOG_ENTER();
+}
 
-Metadata::~Metadata() { HAL_LOG_ENTER(); }
+Metadata::~Metadata() {
+  HAL_LOG_ENTER();
+}
 
 void Metadata::AddComponent(
     std::unique_ptr<PartialMetadataInterface> component) {
@@ -71,21 +75,24 @@
   // Populate the meta fields.
   static_tags.push_back(ANDROID_REQUEST_AVAILABLE_REQUEST_KEYS);
   res = metadata->update(ANDROID_REQUEST_AVAILABLE_REQUEST_KEYS,
-                         control_tags.data(), control_tags.size());
+                         control_tags.data(),
+                         control_tags.size());
   if (res != android::OK) {
     HAL_LOGE("Failed to add request keys meta key.");
     return -ENODEV;
   }
   static_tags.push_back(ANDROID_REQUEST_AVAILABLE_RESULT_KEYS);
   res = metadata->update(ANDROID_REQUEST_AVAILABLE_RESULT_KEYS,
-                         dynamic_tags.data(), dynamic_tags.size());
+                         dynamic_tags.data(),
+                         dynamic_tags.size());
   if (res != android::OK) {
     HAL_LOGE("Failed to add result keys meta key.");
     return -ENODEV;
   }
   static_tags.push_back(ANDROID_REQUEST_AVAILABLE_CHARACTERISTICS_KEYS);
   res = metadata->update(ANDROID_REQUEST_AVAILABLE_CHARACTERISTICS_KEYS,
-                         static_tags.data(), static_tags.size());
+                         static_tags.data(),
+                         static_tags.size());
   if (res != android::OK) {
     HAL_LOGE("Failed to add characteristics keys meta key.");
     return -ENODEV;
@@ -98,7 +105,8 @@
   HAL_LOG_ENTER();
 
   // Empty means "use previous settings", which are inherently valid.
-  if (metadata.isEmpty()) return true;
+  if (metadata.isEmpty())
+    return true;
 
   for (auto& component : components_) {
     // Check that all components support the values requested of them.
@@ -116,7 +124,8 @@
   HAL_LOG_ENTER();
 
   // Empty means "use previous settings".
-  if (metadata.isEmpty()) return 0;
+  if (metadata.isEmpty())
+    return 0;
 
   for (auto& component : components_) {
     int res = component->SetRequestValues(metadata);