Enable clang-tidy (and fix warnings)
Test: keymaster_tests
Change-Id: Ia9455b0be7be71eca1b41a674f2dc7b9e9b00e8c
diff --git a/ng/AndroidRemotelyProvisionedComponentDevice.cpp b/ng/AndroidRemotelyProvisionedComponentDevice.cpp
index 0e5387c..ccd13d5 100644
--- a/ng/AndroidRemotelyProvisionedComponentDevice.cpp
+++ b/ng/AndroidRemotelyProvisionedComponentDevice.cpp
@@ -33,16 +33,16 @@
namespace aidl::android::hardware::security::keymint {
+using keymaster::GenerateCsrRequest;
+using keymaster::GenerateCsrResponse;
+using keymaster::GenerateRkpKeyRequest;
+using keymaster::GenerateRkpKeyResponse;
+using keymaster::KeymasterBlob;
using ::std::string;
-using ::std::tuple;
using ::std::unique_ptr;
-using ::std::variant;
using ::std::vector;
using bytevec = ::std::vector<uint8_t>;
-using namespace cppcose;
-using namespace keymaster;
-
namespace {
constexpr auto STATUS_FAILED = IRemotelyProvisionedComponent::STATUS_FAILED;
@@ -63,7 +63,9 @@
Status(Status&&) = default;
Status(const Status&) = delete;
- operator ::ndk::ScopedAStatus() && { return ndk::ScopedAStatus(status_.release()); }
+ operator ::ndk::ScopedAStatus() && { // NOLINT(google-explicit-constructor)
+ return ndk::ScopedAStatus(status_.release());
+ }
bool isOk() const { return AStatus_isOk(status_.get()); }