Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e231fca7 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge changes I156bfefd,I14b0b7e8 am: 455364c6 am: e9643eb9 

am: fd56ef8d

Change-Id: Ic8afc27200944e80826de62632d42de8090f81df
parents b893c7e0 fd56ef8d

bootstat/bootstat.cpp

+7 −5
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ const std::map<std::string, int32_t> kBootReasonMap = { 
    {"reboot,rescueparty", 90},

    {"charge", 91},

    {"oem_tz_crash", 92},

    {"uvlo", 93},

    {"uvlo", 93},  // aliasReasons converts to reboot,undervoltage

    {"oem_ps_hold", 94},

    {"abnormal_reset", 95},

    {"oemerr_unknown", 96},
@@ -248,9 +248,9 @@ const std::map<std::string, int32_t> kBootReasonMap = { 
    {"watchdog_nonsec", 102},

    {"watchdog_apps_bark", 103},

    {"reboot_dmverity_corrupted", 104},

    {"reboot_smpl", 105},

    {"reboot_smpl", 105},  // aliasReasons converts to reboot,powerloss

    {"watchdog_sdi_apps_reset", 106},

    {"smpl", 107},

    {"smpl", 107},  // aliasReasons converts to reboot,powerloss

    {"oem_modem_failed_to_powerup", 108},

    {"reboot_normal", 109},

    {"oem_lpass_cfg", 110},
@@ -262,8 +262,8 @@ const std::map<std::string, int32_t> kBootReasonMap = { 
    {"oem_rpm_undef_error", 116},

    {"oem_crash_on_the_lk", 117},

    {"oem_rpm_reset", 118},

    {"REUSE1", 119},  // Former dupe, can be re-used

    {"REUSE2", 120},  // Former dupe, can be re-used

    {"reboot,powerloss", 119},

    {"reboot,undervoltage", 120},

    {"factory_cable", 121},

    {"oem_ar6320_failed_to_powerup", 122},

    {"watchdog_rpm_bite", 123},
@@ -840,6 +840,8 @@ std::string BootReasonStrToReason(const std::string& boot_reason) { 
        {"reboot,tool", "tool_by_pass_pwk"},

        {"!reboot,longkey", "reboot_longkey"},

        {"!reboot,longkey", "kpdpwr"},

        {"!reboot,undervoltage", "uvlo"},

        {"!reboot,powerloss", "smpl"},

        {"bootloader", ""},

    };