Merge "Model KeyStore security level in keymaster worker" am: ae73ca248e
Original change: https://android-review.googlesource.com/c/platform/system/security/+/1418729
Change-Id: I72df29824042c5e517744f2e19da5cfc9b3c4c8c
diff --git a/keystore/include/keystore/keystore.h b/keystore/include/keystore/keystore.h
index f840eb7..ab6c682 100644
--- a/keystore/include/keystore/keystore.h
+++ b/keystore/include/keystore/keystore.h
@@ -59,7 +59,6 @@
ABORT_CALLED = 18,
PRUNED = 19,
BINDER_DIED = 20,
-
};
/*
diff --git a/keystore/key_attestation_log_handler.h b/keystore/key_attestation_log_handler.h
index e69e667..a418bfa 100644
--- a/keystore/key_attestation_log_handler.h
+++ b/keystore/key_attestation_log_handler.h
@@ -23,4 +23,4 @@
}
-#endif //_KEY_ATTESTATION_LOG_HANDLER_H_
\ No newline at end of file
+#endif //_KEY_ATTESTATION_LOG_HANDLER_H_
diff --git a/keystore/key_operation_log_handler.cpp b/keystore/key_operation_log_handler.cpp
index 140d5a7..e7f4345 100644
--- a/keystore/key_operation_log_handler.cpp
+++ b/keystore/key_operation_log_handler.cpp
@@ -133,4 +133,4 @@
responseCode);
}
-} // namespace keystore
+} // namespace keystore
\ No newline at end of file
diff --git a/keystore/key_operation_log_handler.h b/keystore/key_operation_log_handler.h
index efd3f00..ba27747 100644
--- a/keystore/key_operation_log_handler.h
+++ b/keystore/key_operation_log_handler.h
@@ -25,4 +25,4 @@
} // namespace keystore
-#endif // KEY_OPERATION_LOG_HANDLER_H_
+#endif // KEY_OPERATION_LOG_HANDLER_H_
\ No newline at end of file