PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the input parameter for "set_retry_bootloader_message"" am: 0e60ccdc76 am: 1d6f88675b

Browse Source 
am: f1546892e1

Change-Id: If5d97891ffae307ada2948b771f113e82235fd73
This commit is contained in:
Tianjie Xu
2017-05-17 20:20:00 +00:00
committed by android-build-merger
parent 763b52dd45 f1546892e1
commit 1941f61fb6
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recovery.cpp
+13 -13
View File
@@ -1304,20 +1304,20 @@ 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; std::vector<std::string> options;
for (int i = 1; i < argc; ++i) { for (const auto& arg : args) {
if (strstr(argv[i], "retry_count") == nullptr) { if (!android::base::StartsWith(arg, "--retry_count")) {
options.push_back(argv[i]); options.push_back(arg);
}
} }
}
// Increment the retry counter by 1. // Increment the retry counter by 1.
options.push_back(android::base::StringPrintf("--retry_count=%d", retry_count+1)); options.push_back(android::base::StringPrintf("--retry_count=%d", retry_count + 1));
std::string err; std::string err;
if (!update_bootloader_message(options, &err)) { if (!update_bootloader_message(options, &err)) {
LOG(ERROR) << err; LOG(ERROR) << err;
} }
} }
static bool bootreason_in_blacklist() { static bool bootreason_in_blacklist() {
@@ -1534,7 +1534,7 @@ int main(int argc, char **argv) {
// times before we abandon this OTA update. // times before we abandon this OTA update.
if (status == INSTALL_RETRY && retry_count < EIO_RETRY_COUNT) { if (status == INSTALL_RETRY && retry_count < EIO_RETRY_COUNT) {
copy_logs(); copy_logs();
set_retry_bootloader_message(retry_count, argc, argv); set_retry_bootloader_message(retry_count, args);
// Print retry count on screen. // Print retry count on screen.
ui->Print("Retry attempt %d\n", retry_count); ui->Print("Retry attempt %d\n", retry_count);