diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-04-21 09:07:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-21 09:07:44 +0000 |
| commit | a7b67eeac566ccdc71f859a2366a5fb6a661e149 (patch) | |
| tree | 7f4f7197da616f38fc71f9bc17191189bc147167 | |
| parent | 147c007fada6fc556f140251190b1ea42f7a51eb (diff) | |
| parent | 6fcc0ac1f356853ff9459cc9c47af8aacdb1b959 (diff) | |
| download | recovery-a7b67eeac566ccdc71f859a2366a5fb6a661e149.tar.gz | |
Merge "Log a copy of recovery log to kernel logs" am: 7c4d5accbf am: a53fa18a23 am: 6fcc0ac1f3
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2070207
Change-Id: I97e7ea1cb2ba4fddd488b2a92823618d1ceaea57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | recovery_main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/recovery_main.cpp b/recovery_main.cpp index 80cba61d..9a358aba 100644 --- a/recovery_main.cpp +++ b/recovery_main.cpp @@ -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); } |