diff options
author | Tianjie Xu <xunchang@google.com> | 2017-05-17 22:13:31 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-17 22:13:31 +0200 |
commit | 1d6f88675bc755b735e045201086c93a555d422a (patch) | |
tree | 2e76bdbeb6a4de0434c9060d7dc91ab3ab702102 | |
parent | Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." (diff) | |
parent | Merge "Fix the input parameter for "set_retry_bootloader_message"" (diff) | |
download | android_bootable_recovery-1d6f88675bc755b735e045201086c93a555d422a.tar android_bootable_recovery-1d6f88675bc755b735e045201086c93a555d422a.tar.gz android_bootable_recovery-1d6f88675bc755b735e045201086c93a555d422a.tar.bz2 android_bootable_recovery-1d6f88675bc755b735e045201086c93a555d422a.tar.lz android_bootable_recovery-1d6f88675bc755b735e045201086c93a555d422a.tar.xz android_bootable_recovery-1d6f88675bc755b735e045201086c93a555d422a.tar.zst android_bootable_recovery-1d6f88675bc755b735e045201086c93a555d422a.zip |
Diffstat (limited to '')
-rw-r--r-- | recovery.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/recovery.cpp b/recovery.cpp index 944c24086..dfae7f03d 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -1304,20 +1304,20 @@ static bool is_battery_ok() { } } -static void set_retry_bootloader_message(int retry_count, int argc, char** argv) { - std::vector<std::string> options; - for (int i = 1; i < argc; ++i) { - if (strstr(argv[i], "retry_count") == nullptr) { - options.push_back(argv[i]); - } +static void set_retry_bootloader_message(int retry_count, const std::vector<std::string>& args) { + std::vector<std::string> options; + for (const auto& arg : args) { + if (!android::base::StartsWith(arg, "--retry_count")) { + options.push_back(arg); } + } - // Increment the retry counter by 1. - options.push_back(android::base::StringPrintf("--retry_count=%d", retry_count+1)); - std::string err; - if (!update_bootloader_message(options, &err)) { - LOG(ERROR) << err; - } + // Increment the retry counter by 1. + options.push_back(android::base::StringPrintf("--retry_count=%d", retry_count + 1)); + std::string err; + if (!update_bootloader_message(options, &err)) { + LOG(ERROR) << err; + } } static bool bootreason_in_blacklist() { @@ -1534,7 +1534,7 @@ int main(int argc, char **argv) { // times before we abandon this OTA update. if (status == INSTALL_RETRY && retry_count < EIO_RETRY_COUNT) { copy_logs(); - set_retry_bootloader_message(retry_count, argc, argv); + set_retry_bootloader_message(retry_count, args); // Print retry count on screen. ui->Print("Retry attempt %d\n", retry_count); |