commit 32873528705eb2cf8b12a31ccad9f7bf4f9a30f1
author Shawn Willden <swillden@google.com> Mon Dec 14 22:29:46 2020 -0700
committer Shawn Willden <swillden@google.com> Tue Dec 15 13:54:50 2020 -0700
tree 3af24b4407692b1c473bfa14559fc68e656f1045
parent ff4c4b1454d6861357c38d6ed758f5e84f395181

Clang-format system/keymaster.

Also replace #include guards with #pragma once.

Bug: 171846199
Test: build
Change-Id: Iade7610270a0b9ad4c95b6bc72e5fa4e758e7025

ng/AndroidKeymaster4Device.cpp

diff --git a/ng/AndroidKeymaster4Device.cpp b/ng/AndroidKeymaster4Device.cpp
index f06fcd9..d5ba734 100644
--- a/ng/AndroidKeymaster4Device.cpp
+++ b/ng/AndroidKeymaster4Device.cpp
@@ -106,8 +106,7 @@
 inline static hidl_vec<hidl_vec<uint8_t>>
 kmCertChain2Hidl(const keymaster_cert_chain_t& cert_chain) {
     hidl_vec<hidl_vec<uint8_t>> result;
-    if (!cert_chain.entry_count || !cert_chain.entries)
-        return result;
+    if (!cert_chain.entry_count || !cert_chain.entries) return result;
 
     result.resize(cert_chain.entry_count);
     for (size_t i = 0; i < cert_chain.entry_count; ++i) {
@@ -119,8 +118,7 @@
 
 static inline hidl_vec<KeyParameter> kmParamSet2Hidl(const keymaster_key_param_set_t& set) {
     hidl_vec<KeyParameter> result;
-    if (set.length == 0 || set.params == nullptr)
-        return result;
+    if (set.length == 0 || set.params == nullptr) return result;
 
     result.resize(set.length);
     keymaster_key_param_t* params = set.params;
@@ -234,8 +232,7 @@
 AndroidKeymaster4Device::~AndroidKeymaster4Device() {}
 
 Return<void> AndroidKeymaster4Device::getHardwareInfo(getHardwareInfo_cb _hidl_cb) {
-    _hidl_cb(securityLevel_,
-             "SoftwareKeymasterDevice", "Google");
+    _hidl_cb(securityLevel_, "SoftwareKeymasterDevice", "Google");
     return Void();
 }
 
@@ -306,8 +303,7 @@
 }
 
 Return<ErrorCode> AndroidKeymaster4Device::addRngEntropy(const hidl_vec<uint8_t>& data) {
-    if (data.size() == 0)
-        return ErrorCode::OK;
+    if (data.size() == 0) return ErrorCode::OK;
     AddEntropyRequest request;
     request.random_data.Reinitialize(data.data(), data.size());