Merge "Log a copy of recovery log to kernel logs" am: 7c4d5accbf
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2070207 Change-Id: Ibef5beb86b9a3119af0b22bc40ce49c9a5a16dd6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
a53fa18a23
1 changed files with 5 additions and 5 deletions
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue