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

Merge changes Iecedc3b1,I28987f08

Browse source 
am: dc17e9efa0

Change-Id: I144c0fa56aaae45abf3c318a0adcee2e119c71e5
This commit is contained in:
Mark Salyzyn 2018-06-04 15:49:07 -07:00 • committed by android-build-merger
commit 0d18efbdf8
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bootstat/boot_reason_test.sh
View file

@ -445,6 +445,10 @@ validate_reason() {
*hw_reset* ) var="hard,hw_reset" ;; *hw_reset* ) var="hard,hw_reset" ;;
*usb* ) var="cold,charger" ;; *usb* ) var="cold,charger" ;;
*rtc* ) var="cold,rtc" ;; *rtc* ) var="cold,rtc" ;;
*2sec_reboot* ) var="cold,rtc,2sec" ;;
*wdt_by_pass_pwk* ) var="warm" ;;
wdt ) var="reboot" ;;
*tool_by_pass_pwk* ) var="reboot,tool" ;;
*bootloader* ) var="bootloader" ;; *bootloader* ) var="bootloader" ;;
* ) var="reboot" ;; * ) var="reboot" ;;
esac esac

13
bootstat/bootstat.cpp
View file

@ -201,7 +201,7 @@ const std::map<std::string, int32_t> kBootReasonMap = {
{"cold", 56}, {"cold", 56},
{"hard", 57}, {"hard", 57},
{"warm", 58}, {"warm", 58},
// {"recovery", 59}, // Duplicate of enum 3 above. Immediate reuse possible. {"reboot,kernel_power_off_charging__reboot_system", 59}, // Can not happen
{"thermal-shutdown", 60}, {"thermal-shutdown", 60},
{"shutdown,thermal", 61}, {"shutdown,thermal", 61},
{"shutdown,battery", 62}, {"shutdown,battery", 62},
@ -228,7 +228,7 @@ const std::map<std::string, int32_t> kBootReasonMap = {
{"2sec_reboot", 83}, {"2sec_reboot", 83},
{"reboot,by_key", 84}, {"reboot,by_key", 84},
{"reboot,longkey", 85}, {"reboot,longkey", 85},
{"reboot,2sec", 86}, {"reboot,2sec", 86}, // Deprecate in two years, replaced with cold,rtc,2sec
{"shutdown,thermal,battery", 87}, {"shutdown,thermal,battery", 87},
{"reboot,its_just_so_hard", 88}, // produced by boot_reason_test {"reboot,its_just_so_hard", 88}, // produced by boot_reason_test
{"reboot,Its Just So Hard", 89}, // produced by boot_reason_test {"reboot,Its Just So Hard", 89}, // produced by boot_reason_test
@ -790,7 +790,10 @@ std::string BootReasonStrToReason(const std::string& boot_reason) {
{"hard,hw_reset", "hw_reset"}, {"hard,hw_reset", "hw_reset"},
{"cold,charger", "usb"}, {"cold,charger", "usb"},
{"cold,rtc", "rtc"}, {"cold,rtc", "rtc"},
{"reboot,2sec", "2sec_reboot"}, {"cold,rtc,2sec", "2sec_reboot"},
{"!warm", "wdt_by_pass_pwk"}, // change flavour of blunt
{"!reboot", "^wdt$"}, // change flavour of blunt
{"reboot,tool", "tool_by_pass_pwk"},
{"bootloader", ""}, {"bootloader", ""},
}; };
@ -850,6 +853,10 @@ std::string BootReasonStrToReason(const std::string& boot_reason) {
ret = "reboot," + subReason; // legitimize unknown reasons ret = "reboot," + subReason; // legitimize unknown reasons
} }
} }
// Some bootloaders shutdown results record in last kernel message.
if (!strcmp(ret.c_str(), "reboot,kernel_power_off_charging__reboot_system")) {
ret = "shutdown";
}
} }
// Check for kernel panics, allowed to override reboot command. // Check for kernel panics, allowed to override reboot command.