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

Commit 445c948c authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-c72e46fd-06a9-4104-bad3-f7ba8aeb3e1d-for-git_oc-release-402991...

release-request-c72e46fd-06a9-4104-bad3-f7ba8aeb3e1d-for-git_oc-release-4029917 snap-temp-L38800000066299680

Change-Id: I8fd5a0c76fe7275b05cc3fb7713a582920cfe76c
parents 48d80561 539b08cf
Loading
Loading
Loading
Loading
+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);