diff options
author | Tianjie Xu <xunchang@google.com> | 2017-01-10 20:17:55 +0100 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-01-10 20:17:55 +0100 |
commit | 4ab40a064d80efd9fa0479edba3faf50d80a87a9 (patch) | |
tree | 83dfb19ae7cc08ef4193d411f418c07f8200ce11 /otafault | |
parent | Merge "Address review comment." am: 77ec0071cf am: 3e003ceeda (diff) | |
parent | Merge "Do not inject I/O fault on a retry" am: 37d74f3e20 (diff) | |
download | android_bootable_recovery-4ab40a064d80efd9fa0479edba3faf50d80a87a9.tar android_bootable_recovery-4ab40a064d80efd9fa0479edba3faf50d80a87a9.tar.gz android_bootable_recovery-4ab40a064d80efd9fa0479edba3faf50d80a87a9.tar.bz2 android_bootable_recovery-4ab40a064d80efd9fa0479edba3faf50d80a87a9.tar.lz android_bootable_recovery-4ab40a064d80efd9fa0479edba3faf50d80a87a9.tar.xz android_bootable_recovery-4ab40a064d80efd9fa0479edba3faf50d80a87a9.tar.zst android_bootable_recovery-4ab40a064d80efd9fa0479edba3faf50d80a87a9.zip |
Diffstat (limited to '')
-rw-r--r-- | otafault/config.cpp | 6 | ||||
-rw-r--r-- | otafault/config.h | 2 |
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. |