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

Merge "bootstat: reboot cold, warm and hard tests failed"

Browse source
This commit is contained in:
Mark Salyzyn 2017-09-19 14:32:57 +00:00 • committed by Gerrit Code Review
commit ae054903af
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bootstat/boot_reason_test.sh
View file

@ -162,7 +162,7 @@ bootstat: Canonical boot reason: ${i}"
fi
done
adb logcat -b all -d |
grep bootstat |
grep bootstat[^e] |
grep -v -F "bootstat: Service started: /system/bin/bootstat --record_boot_complete${match}
bootstat: Failed to read /data/misc/bootstat/post_decrypt_time_elapsed: No such file or directory
bootstat: Failed to parse boot time record: /data/misc/bootstat/post_decrypt_time_elapsed

3
bootstat/bootstat.cpp
View file

@ -494,7 +494,8 @@ std::string BootReasonStrToReason(const std::string& boot_reason) {
// String is either "reboot,<reason>" or "shutdown,<reason>".
// We will set if default reasons, only override with detail if thermal.
if (!isBluntRebootReason(content)) {
if ((android::base::StartsWith(content, ret.c_str()) && (content[ret.length()] == ',')) ||
!isBluntRebootReason(content)) {
// Ok, we want it, let's squash it if secondReason is known.
pos = content.find(',');
if (pos != std::string::npos) {