summaryrefslogtreecommitdiffstats
path: root/updater/updater.cpp
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-08-29 05:01:25 +0200
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-08-29 05:01:25 +0200
commitf79f948733a3e923e38fc5401f5a4a17680708c4 (patch)
tree8b40951fec00af3b937baf52cd4dbf6563634065 /updater/updater.cpp
parentSnap for 4977457 from 096c66546e0fb49c0caf9e491327ef87da6bc6ef to qt-release (diff)
parentMerge "Enable c++17 in recovery_defaults." am: 6a333cde10 am: 287881d558 (diff)
downloadandroid_bootable_recovery-f79f948733a3e923e38fc5401f5a4a17680708c4.tar
android_bootable_recovery-f79f948733a3e923e38fc5401f5a4a17680708c4.tar.gz
android_bootable_recovery-f79f948733a3e923e38fc5401f5a4a17680708c4.tar.bz2
android_bootable_recovery-f79f948733a3e923e38fc5401f5a4a17680708c4.tar.lz
android_bootable_recovery-f79f948733a3e923e38fc5401f5a4a17680708c4.tar.xz
android_bootable_recovery-f79f948733a3e923e38fc5401f5a4a17680708c4.tar.zst
android_bootable_recovery-f79f948733a3e923e38fc5401f5a4a17680708c4.zip
Diffstat (limited to 'updater/updater.cpp')
-rw-r--r--updater/updater.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/updater/updater.cpp b/updater/updater.cpp
index e06d45355..e87c57a5c 100644
--- a/updater/updater.cpp
+++ b/updater/updater.cpp
@@ -31,7 +31,6 @@
#include <ziparchive/zip_archive.h>
#include "edify/expr.h"
-#include "otafault/config.h"
#include "otautil/dirutil.h"
#include "otautil/error_code.h"
#include "otautil/sysutil.h"
@@ -47,8 +46,6 @@
// (Note it's "updateR-script", not the older "update-script".)
static constexpr const char* SCRIPT_NAME = "META-INF/com/google/android/updater-script";
-extern bool have_eio_error;
-
struct selabel_handle *sehandle;
static void UpdaterLogger(android::base::LogId /* id */, android::base::LogSeverity /* severity */,
@@ -166,15 +163,10 @@ int main(int argc, char** argv) {
printf("unexpected argument: %s", argv[4]);
}
}
- ota_io_init(za, state.is_retry);
std::string result;
bool status = Evaluate(&state, root, &result);
- if (have_eio_error) {
- fprintf(cmd_pipe, "retry_update\n");
- }
-
if (!status) {
if (state.errmsg.empty()) {
LOG(ERROR) << "script aborted (no error message)";
@@ -206,6 +198,9 @@ int main(int argc, char** argv) {
if (state.cause_code == kPatchApplicationFailure) {
LOG(INFO) << "Patch application failed, retry update.";
fprintf(cmd_pipe, "retry_update\n");
+ } else if (state.cause_code == kEioFailure) {
+ LOG(INFO) << "Update failed due to EIO, retry update.";
+ fprintf(cmd_pipe, "retry_update\n");
}
}