ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Improve logging in bootstat."

Browse source
This commit is contained in:
Nikita Ioffe 2020-04-02 18:12:55 +00:00 • committed by Gerrit Code Review
commit 2884943687
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bootstat/bootstat.cpp
View file

@ -1238,16 +1238,26 @@ void SetSystemBootReason() {
// Shift last_reboot_reason_property to last_last_reboot_reason_property // Shift last_reboot_reason_property to last_last_reboot_reason_property
std::string last_boot_reason; std::string last_boot_reason;
if (!android::base::ReadFileToString(last_reboot_reason_file, &last_boot_reason)) { if (!android::base::ReadFileToString(last_reboot_reason_file, &last_boot_reason)) {
PLOG(ERROR) << "Failed to read " << last_reboot_reason_file;
last_boot_reason = android::base::GetProperty(last_reboot_reason_property, ""); last_boot_reason = android::base::GetProperty(last_reboot_reason_property, "");
LOG(INFO) << "Value of " << last_reboot_reason_property << " : " << last_boot_reason;
} else {
LOG(INFO) << "Last reboot reason read from " << last_reboot_reason_file << " : "
<< last_boot_reason << ". Last reboot reason read from "
<< last_reboot_reason_property << " : "
<< android::base::GetProperty(last_reboot_reason_property, "");
} }
if (last_boot_reason.empty() || isKernelRebootReason(system_boot_reason)) { if (last_boot_reason.empty() || isKernelRebootReason(system_boot_reason)) {
last_boot_reason = system_boot_reason; last_boot_reason = system_boot_reason;
} else { } else {
transformReason(last_boot_reason); transformReason(last_boot_reason);
} }
LOG(INFO) << "Normalized last reboot reason : " << last_boot_reason;
android::base::SetProperty(last_last_reboot_reason_property, last_boot_reason); android::base::SetProperty(last_last_reboot_reason_property, last_boot_reason);
android::base::SetProperty(last_reboot_reason_property, ""); android::base::SetProperty(last_reboot_reason_property, "");
unlink(last_reboot_reason_file); if (unlink(last_reboot_reason_file) != 0) {
PLOG(ERROR) << "Failed to unlink " << last_reboot_reason_file;
}
} }
// Gets the boot time offset. This is useful when Android is running in a // Gets the boot time offset. This is useful when Android is running in a