summaryrefslogtreecommitdiffstats
path: root/otafault
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2017-01-10 20:23:53 +0100
committerandroid-build-merger <android-build-merger@google.com>2017-01-10 20:23:53 +0100
commit5c658258919a421c7376aa925eb37ed9a185eaf2 (patch)
tree435d4eedaac0ff4f56f661504fef600467b01df3 /otafault
parentMerge "Address review comment." am: 77ec0071cf am: 3e003ceeda am: ac431948d3 (diff)
parentMerge "Do not inject I/O fault on a retry" am: 37d74f3e20 am: 854ef3b9d1 (diff)
downloadandroid_bootable_recovery-5c658258919a421c7376aa925eb37ed9a185eaf2.tar
android_bootable_recovery-5c658258919a421c7376aa925eb37ed9a185eaf2.tar.gz
android_bootable_recovery-5c658258919a421c7376aa925eb37ed9a185eaf2.tar.bz2
android_bootable_recovery-5c658258919a421c7376aa925eb37ed9a185eaf2.tar.lz
android_bootable_recovery-5c658258919a421c7376aa925eb37ed9a185eaf2.tar.xz
android_bootable_recovery-5c658258919a421c7376aa925eb37ed9a185eaf2.tar.zst
android_bootable_recovery-5c658258919a421c7376aa925eb37ed9a185eaf2.zip
Diffstat (limited to 'otafault')
-rw-r--r--otafault/config.cpp6
-rw-r--r--otafault/config.h2
2 files changed, 5 insertions, 3 deletions
diff --git a/otafault/config.cpp b/otafault/config.cpp
index ee4ef8911..8590833ee 100644
--- a/otafault/config.cpp
+++ b/otafault/config.cpp
@@ -29,21 +29,23 @@
#define OTAIO_MAX_FNAME_SIZE 128
static ZipArchiveHandle archive;
+static bool is_retry = false;
static std::map<std::string, bool> should_inject_cache;
static std::string get_type_path(const char* io_type) {
return android::base::StringPrintf("%s/%s", OTAIO_BASE_DIR, io_type);
}
-void ota_io_init(ZipArchiveHandle za) {
+void ota_io_init(ZipArchiveHandle za, bool retry) {
archive = za;
+ is_retry = retry;
ota_set_fault_files();
}
bool should_fault_inject(const char* io_type) {
// archive will be NULL if we used an entry point other
// than updater/updater.cpp:main
- if (archive == NULL) {
+ if (archive == nullptr || is_retry) {
return false;
}
const std::string type_path = get_type_path(io_type);
diff --git a/otafault/config.h b/otafault/config.h
index c048617c2..4adbdd121 100644
--- a/otafault/config.h
+++ b/otafault/config.h
@@ -52,7 +52,7 @@
/*
* Initialize libotafault by providing a reference to the OTA package.
*/
-void ota_io_init(ZipArchiveHandle zip);
+void ota_io_init(ZipArchiveHandle zip, bool retry);
/*
* Return true if a config file is present for the given IO type.