diff options
| author | Daniel Norman <danielnorman@google.com> | 2020-08-31 12:05:54 -0700 |
|---|---|---|
| committer | Daniel Norman <danielnorman@google.com> | 2020-08-31 12:05:54 -0700 |
| commit | 91cac41eaac97cc068347b9504d5995321ba66e1 (patch) | |
| tree | 719ee38dab8a43fc6d6800815c3213c26987683f /recovery.cpp | |
| parent | 928b81393ed82747b1982211806f1ba2f0ab49f6 (diff) | |
| parent | 6afc292a7c0185aed5a760937a172a566167775f (diff) | |
Merge SP1A.200727.001
Change-Id: Id5994f4f512ab07cb3d7f1c24ce06da62c5e1026
Diffstat (limited to 'recovery.cpp')
| -rw-r--r-- | recovery.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/recovery.cpp b/recovery.cpp index c7a03b6d..6dcffb4c 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -608,15 +608,15 @@ static void set_retry_bootloader_message(int retry_count, const std::vector<std: } } -static bool bootreason_in_blacklist() { +static bool bootreason_in_blocklist() { std::string bootreason = android::base::GetProperty("ro.boot.bootreason", ""); if (!bootreason.empty()) { // More bootreasons can be found in "system/core/bootstat/bootstat.cpp". - static const std::vector<std::string> kBootreasonBlacklist{ + static const std::vector<std::string> kBootreasonBlocklist{ "kernel_panic", "Panic", }; - for (const auto& str : kBootreasonBlacklist) { + for (const auto& str : kBootreasonBlocklist) { if (android::base::EqualsIgnoreCase(str, bootreason)) return true; } } @@ -765,7 +765,7 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri } std::vector<std::string> title_lines = - android::base::Split(android::base::GetProperty("ro.bootimage.build.fingerprint", ""), ":"); + android::base::Split(android::base::GetProperty("ro.build.fingerprint", ""), ":"); title_lines.insert(std::begin(title_lines), "Android Recovery"); ui->SetTitle(title_lines); @@ -809,10 +809,10 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri // Log the error code to last_install when installation skips due to low battery. log_failure_code(kLowBattery, update_package); status = INSTALL_SKIPPED; - } else if (retry_count == 0 && bootreason_in_blacklist()) { + } else if (retry_count == 0 && bootreason_in_blocklist()) { // Skip update-on-reboot when bootreason is kernel_panic or similar - ui->Print("bootreason is in the blacklist; skip OTA installation\n"); - log_failure_code(kBootreasonInBlacklist, update_package); + ui->Print("bootreason is in the blocklist; skip OTA installation\n"); + log_failure_code(kBootreasonInBlocklist, update_package); status = INSTALL_SKIPPED; } else { // It's a fresh update. Initialize the retry_count in the BCB to 1; therefore we can later |