summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
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 /recovery.cpp
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
Diffstat (limited to '')
-rw-r--r--recovery.cpp9
1 files changed, 5 insertions, 4 deletions
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.