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

Merge changes If35518c0,I04bede0b am: bda0a3e637

Browse source 
am: bbdddfa030

Change-Id: I28e587ea4e0818fcdecea35f78d71c5e7b617605
This commit is contained in:
Mark Salyzyn 2018-03-17 00:16:17 +00:00 • committed by android-build-merger
commit 08475ad935
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bootstat/boot_reason_test.sh
View file

@ -429,6 +429,8 @@ validate_reason() {
*thermal* ) var="shutdown,thermal" ;;
*s3_wakeup* ) var="warm,s3_wakeup" ;;
*hw_reset* ) var="hard,hw_reset" ;;
*usb* ) var="cold,charger" ;;
*rtc* ) var="cold,rtc" ;;
*bootloader* ) var="bootloader" ;;
* ) var="reboot" ;;
esac

13
bootstat/bootstat.cpp
View file

@ -290,6 +290,8 @@ const std::map<std::string, int32_t> kBootReasonMap = {
{"oem_sdi_err_fatal", 145},
{"pmic_watchdog", 146},
{"software_master", 147},
{"cold,charger", 148},
{"cold,rtc", 149},
};
// Converts a string value representing the reason the system booted to an
@ -583,7 +585,9 @@ std::string BootReasonStrToReason(const std::string& boot_reason) {
// first member is the output
// second member is an unanchored regex for an alias
//
// We match a needle on output. This helps keep the scale of the
// If output has a prefix of <bang> '!', we do not use it as a
// match needle (and drop the <bang> prefix when landing in output),
// otherwise look for it as well. This helps keep the scale of the
// following table smaller.
static const std::vector<std::pair<const std::string, const std::string>> aliasReasons = {
{"watchdog", "wdog"},
@ -592,17 +596,20 @@ std::string BootReasonStrToReason(const std::string& boot_reason) {
{"shutdown,thermal", "thermal"},
{"warm,s3_wakeup", "s3_wakeup"},
{"hard,hw_reset", "hw_reset"},
{"cold,charger", "usb"},
{"cold,rtc", "rtc"},
{"reboot,2sec", "2sec_reboot"},
{"bootloader", ""},
};
for (auto& s : aliasReasons) {
if (reason.find(s.first) != std::string::npos) {
size_t firstHasNot = s.first[0] == '!';
if (!firstHasNot && (reason.find(s.first) != std::string::npos)) {
ret = s.first;
break;
}
if (s.second.size() && std::regex_search(reason, std::regex(s.second))) {
ret = s.first;
ret = s.first.substr(firstHasNot);
break;
}
}