commit 7c4d5accbf8a0fdfa7a9276147f317252f837456
author Treehugger Robot <treehugger-gerrit@google.com> Thu Apr 21 06:56:28 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 21 06:56:28 2022 +0000
tree 3b79e325c51f8f73099c66b92ce21613e77621ed
parent 5887c946402496039ffe78f2105544f4dd8fd1f7
parent 3d0d9c35f6960807cba0abacf25ef2efd04fe839

Merge "Log a copy of recovery log to kernel logs"

recovery_main.cpp

diff --git a/recovery_main.cpp b/recovery_main.cpp
index 80cba61..9a358ab 100644
--- a/recovery_main.cpp
+++ b/recovery_main.cpp
@@ -73,12 +73,12 @@
   return "orange" == android::base::GetProperty("ro.boot.verifiedbootstate", "");
 }
 
-static void UiLogger(android::base::LogId /* id */, android::base::LogSeverity severity,
-                     const char* /* tag */, const char* /* file */, unsigned int /* line */,
-                     const char* message) {
-  static constexpr char log_characters[] = "VDIWEF";
+static void UiLogger(android::base::LogId log_buffer_id, android::base::LogSeverity severity,
+                     const char* tag, const char* file, unsigned int line, const char* message) {
+  android::base::KernelLogger(log_buffer_id, severity, tag, file, line, message);
+  static constexpr auto&& log_characters = "VDIWEF";
   if (severity >= android::base::ERROR && ui != nullptr) {
-    ui->Print("E:%s\n", message);
+    ui->Print("ERROR: %10s: %s\n", tag, message);
   } else {
     fprintf(stdout, "%c:%s\n", log_characters[severity], message);
   }