Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7b67eea authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Log a copy of recovery log to kernel logs" am: 7c4d5acc am: a53fa18a am: 6fcc0ac1 

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2070207



Change-Id: I97e7ea1cb2ba4fddd488b2a92823618d1ceaea57
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 147c007f 6fcc0ac1

recovery_main.cpp

+5 −5
Original line number Diff line number Diff line
@@ -73,12 +73,12 @@ static bool IsDeviceUnlocked() { 
  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);

  }