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

Commit 539b08cf authored by Tianjie Xu's avatar Tianjie Xu
Browse files

Fix the input parameter for "set_retry_bootloader_message" 

We're not updating argc & argv during get_args(), so some boot
arguments missed when we set the boot message for retry.

Bug: 38383406
Test: boot command sets correctly during retry attempt.
Change-Id: Ie8583a22fad5e0084245e3431d4018518d508dfd
(cherry picked from commit 72449c9f)
parent ed9db0fd

recovery.cpp

+13 −13
Original line number Diff line number Diff line
@@ -1305,11 +1305,11 @@ static bool is_battery_ok() { 
    }

}



static void set_retry_bootloader_message(int retry_count, int argc, char** argv) {

static void set_retry_bootloader_message(int retry_count, const std::vector<std::string>& args) {

  std::vector<std::string> options;

    for (int i = 1; i < argc; ++i) {

        if (strstr(argv[i], "retry_count") == nullptr) {

            options.push_back(argv[i]);

  for (const auto& arg : args) {

    if (!android::base::StartsWith(arg, "--retry_count")) {

      options.push_back(arg);

    }

  }
@@ -1535,7 +1535,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);