summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-04-21 11:23:40 +0200
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-21 11:23:40 +0200
commit56c338ec320e434175f250ca3ab64bee57a3b21d (patch)
tree7f4f7197da616f38fc71f9bc17191189bc147167
parent[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0f3b76b764 am: c6f9bd237c -s ours am: 147c007fad -s ours (diff)
parentMerge "Log a copy of recovery log to kernel logs" am: 7c4d5accbf am: a53fa18a23 am: 6fcc0ac1f3 (diff)
downloadandroid_bootable_recovery-56c338ec320e434175f250ca3ab64bee57a3b21d.tar
android_bootable_recovery-56c338ec320e434175f250ca3ab64bee57a3b21d.tar.gz
android_bootable_recovery-56c338ec320e434175f250ca3ab64bee57a3b21d.tar.bz2
android_bootable_recovery-56c338ec320e434175f250ca3ab64bee57a3b21d.tar.lz
android_bootable_recovery-56c338ec320e434175f250ca3ab64bee57a3b21d.tar.xz
android_bootable_recovery-56c338ec320e434175f250ca3ab64bee57a3b21d.tar.zst
android_bootable_recovery-56c338ec320e434175f250ca3ab64bee57a3b21d.zip
-rw-r--r--recovery_main.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/recovery_main.cpp b/recovery_main.cpp
index 80cba61d3..9a358aba7 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);
}