diff options
| author | Tianjie Xu <xunchang@google.com> | 2020-07-24 19:31:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-24 19:31:13 +0000 |
| commit | 435f3d3f16c27678fcd0ddd01efd2092208bce1a (patch) | |
| tree | 8a627dfb738987b5c1a3181b96b141e628f172ae /recovery.cpp | |
| parent | 934505ba52f8282e1886fcbf7c7ba0401e957f76 (diff) | |
| parent | 74538db6848e1a315923ec765436b62eb3147537 (diff) | |
Merge changes I0f3f0333,If447b2cf am: 435a5fc0c2 am: 74538db684
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1371051
Change-Id: I9fdb4e98eebc0caa9aa1a2bcc9e188a2b6fa6a81
Diffstat (limited to 'recovery.cpp')
| -rw-r--r-- | recovery.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/recovery.cpp b/recovery.cpp index df13835b..84deeb45 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -559,15 +559,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; } } @@ -734,10 +734,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 |