summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
author Henri Chataing <henrichataing@google.com> 2025-03-17 13:07:06 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2025-03-17 13:07:06 -0700
commita60d217ba04916ddb2577774420bfab2bc5cb1bb (patch)
tree92a9449358a4032d98e4184b03648bb277bdfc59 /system
parentbe6854e787cc53e0fd4e57c31b7bff318ea702c8 (diff)
parentbc7b1d53294085a33f17a73c717ee08e5fd27f50 (diff)
Merge "gd: Fix SEC_TAG_BLUETOOTH_CONNECTION event" into main
Diffstat (limited to 'system')
-rw-r--r--system/gd/common/audit_log.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/system/gd/common/audit_log.cc b/system/gd/common/audit_log.cc
index e83c2894f8..2e112a0c34 100644
--- a/system/gd/common/audit_log.cc
+++ b/system/gd/common/audit_log.cc
@@ -16,6 +16,8 @@
#include "common/audit_log.h"
+#include <format>
+
#ifdef __ANDROID__
#include <log/log_event_list.h>
#endif // __ANDROID__
@@ -43,8 +45,8 @@ void LogConnectionAdminAuditEvent([[maybe_unused]] const char* action,
android_log_event_list(SEC_TAG_BLUETOOTH_CONNECTION)
<< address.ToRedactedStringForLogging()
- << /* success */ int32_t(status == hci::ErrorCode::SUCCESS) << action << ": "
- << ErrorCodeText(status) << LOG_ID_SECURITY;
+ << /* success */ int32_t(status == hci::ErrorCode::SUCCESS)
+ << std::format("{}: {}", action, ErrorCodeText(status)) << LOG_ID_SECURITY;
#endif /* defined(__ANDROID__) && !defined (FUZZ_TARGET) */
}