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

Merge "bootstat: comment out duplicate entries in kBootReasonMap"

Browse source 
am: 1408ceec4f

Change-Id: Ief59024678937b79200daeef5d9a1a70be43b3f1
This commit is contained in:
Mark Salyzyn 2018-03-16 21:31:56 +00:00 • committed by android-build-merger
commit 07e4e9b5fc
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bootstat/bootstat.cpp
View file

@ -139,7 +139,7 @@ constexpr int32_t kUnknownBootReason = 1;
// values. // values.
const std::map<std::string, int32_t> kBootReasonMap = { const std::map<std::string, int32_t> kBootReasonMap = {
{"empty", kEmptyBootReason}, {"empty", kEmptyBootReason},
{"unknown", kUnknownBootReason}, {"__BOOTSTAT_UNKNOWN__", kUnknownBootReason},
{"normal", 2}, {"normal", 2},
{"recovery", 3}, {"recovery", 3},
{"reboot", 4}, {"reboot", 4},
@ -199,7 +199,7 @@ const std::map<std::string, int32_t> kBootReasonMap = {
{"cold", 56}, {"cold", 56},
{"hard", 57}, {"hard", 57},
{"warm", 58}, {"warm", 58},
{"recovery", 59}, // {"recovery", 59}, // Duplicate of enum 3 above. Immediate reuse possible.
{"thermal-shutdown", 60}, {"thermal-shutdown", 60},
{"shutdown,thermal", 61}, {"shutdown,thermal", 61},
{"shutdown,battery", 62}, {"shutdown,battery", 62},
@ -230,7 +230,7 @@ const std::map<std::string, int32_t> kBootReasonMap = {
{"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
{"usb", 90}, // {"usb", 90}, // Duplicate of enum 80 above. Immediate reuse possible.
{"charge", 91}, {"charge", 91},
{"oem_tz_crash", 92}, {"oem_tz_crash", 92},
{"uvlo", 93}, {"uvlo", 93},