summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2017-05-24 20:48:04 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-05-24 20:48:04 +0200
commit66f02b4e7100b70520afc58884214a50ee82a395 (patch)
tree6ccc20bb5be3a08af14e1c56dbf332decb6eafe2
parentMerge "Print SHA1 of the patch if bsdiff fails with data error" (diff)
parentMerge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" (diff)
downloadandroid_bootable_recovery-66f02b4e7100b70520afc58884214a50ee82a395.tar
android_bootable_recovery-66f02b4e7100b70520afc58884214a50ee82a395.tar.gz
android_bootable_recovery-66f02b4e7100b70520afc58884214a50ee82a395.tar.bz2
android_bootable_recovery-66f02b4e7100b70520afc58884214a50ee82a395.tar.lz
android_bootable_recovery-66f02b4e7100b70520afc58884214a50ee82a395.tar.xz
android_bootable_recovery-66f02b4e7100b70520afc58884214a50ee82a395.tar.zst
android_bootable_recovery-66f02b4e7100b70520afc58884214a50ee82a395.zip
-rw-r--r--error_code.h1
-rw-r--r--recovery.cpp9
-rw-r--r--updater/blockimg.cpp2
-rw-r--r--updater/updater.cpp4
4 files changed, 12 insertions, 4 deletions
diff --git a/error_code.h b/error_code.h
index 0e79c87ca..9fe047c91 100644
--- a/error_code.h
+++ b/error_code.h
@@ -44,6 +44,7 @@ enum CauseCode {
kTune2FsFailure,
kRebootFailure,
kPackageExtractFileFailure,
+ kPatchApplicationFailure,
kVendorFailure = 200
};
diff --git a/recovery.cpp b/recovery.cpp
index dfae7f03d..122b89d0b 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -112,8 +112,9 @@ static const char *TEMPORARY_LOG_FILE = "/tmp/recovery.log";
static const char *TEMPORARY_INSTALL_FILE = "/tmp/last_install";
static const char *LAST_KMSG_FILE = "/cache/recovery/last_kmsg";
static const char *LAST_LOG_FILE = "/cache/recovery/last_log";
-// We will try to apply the update package 5 times at most in case of an I/O error.
-static const int EIO_RETRY_COUNT = 4;
+// We will try to apply the update package 5 times at most in case of an I/O error or
+// bspatch | imgpatch error.
+static const int RETRY_LIMIT = 4;
static const int BATTERY_READ_TIMEOUT_IN_SEC = 10;
// GmsCore enters recovery mode to install package when having enough battery
// percentage. Normally, the threshold is 40% without charger and 20% with charger.
@@ -1530,9 +1531,9 @@ int main(int argc, char **argv) {
}
if (status != INSTALL_SUCCESS) {
ui->Print("Installation aborted.\n");
- // When I/O error happens, reboot and retry installation EIO_RETRY_COUNT
+ // When I/O error happens, reboot and retry installation RETRY_LIMIT
// times before we abandon this OTA update.
- if (status == INSTALL_RETRY && retry_count < EIO_RETRY_COUNT) {
+ if (status == INSTALL_RETRY && retry_count < RETRY_LIMIT) {
copy_logs();
set_retry_bootloader_message(retry_count, args);
// Print retry count on screen.
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index d5c170473..df366b0b8 100644
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -1213,6 +1213,7 @@ static int PerformCommandDiff(CommandParameters& params) {
std::placeholders::_2),
nullptr, nullptr) != 0) {
LOG(ERROR) << "Failed to apply image patch.";
+ failure_type = kPatchApplicationFailure;
return -1;
}
} else {
@@ -1221,6 +1222,7 @@ static int PerformCommandDiff(CommandParameters& params) {
std::placeholders::_2),
nullptr) != 0) {
LOG(ERROR) << "Failed to apply bsdiff patch.";
+ failure_type = kPatchApplicationFailure;
return -1;
}
}
diff --git a/updater/updater.cpp b/updater/updater.cpp
index 1be8b6040..f5ff6df91 100644
--- a/updater/updater.cpp
+++ b/updater/updater.cpp
@@ -202,6 +202,10 @@ int main(int argc, char** argv) {
// Cause code should provide additional information about the abort.
if (state.cause_code != kNoCause) {
fprintf(cmd_pipe, "log cause: %d\n", state.cause_code);
+ if (state.cause_code == kPatchApplicationFailure) {
+ LOG(INFO) << "Patch application failed, retry update.";
+ fprintf(cmd_pipe, "retry_update\n");
+ }
}
if (updater_info.package_zip) {