summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-12-19 20:26:39 +0100
committerandroid-build-merger <android-build-merger@google.com>2016-12-19 20:26:39 +0100
commit88bd5d59de100adce3f674ae9549caa120dcd6a3 (patch)
treea6ac7f068f85d69c980ffa82cd2d5f585c58fada
parentMerge "resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp (diff)
parentMerge "Bugfix:updater always retry apply patch failed,when memcpy failed." (diff)
downloadandroid_bootable_recovery-88bd5d59de100adce3f674ae9549caa120dcd6a3.tar
android_bootable_recovery-88bd5d59de100adce3f674ae9549caa120dcd6a3.tar.gz
android_bootable_recovery-88bd5d59de100adce3f674ae9549caa120dcd6a3.tar.bz2
android_bootable_recovery-88bd5d59de100adce3f674ae9549caa120dcd6a3.tar.lz
android_bootable_recovery-88bd5d59de100adce3f674ae9549caa120dcd6a3.tar.xz
android_bootable_recovery-88bd5d59de100adce3f674ae9549caa120dcd6a3.tar.zst
android_bootable_recovery-88bd5d59de100adce3f674ae9549caa120dcd6a3.zip
-rw-r--r--applypatch/applypatch.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/applypatch/applypatch.cpp b/applypatch/applypatch.cpp
index 95389da6e..8682e128b 100644
--- a/applypatch/applypatch.cpp
+++ b/applypatch/applypatch.cpp
@@ -332,6 +332,17 @@ int WriteToPartition(const unsigned char* data, size_t len, const std::string& t
success = true;
break;
}
+
+ if (ota_close(fd) != 0) {
+ printf("failed to close %s: %s\n", partition, strerror(errno));
+ return -1;
+ }
+
+ fd.reset(ota_open(partition, O_RDWR));
+ if (fd == -1) {
+ printf("failed to reopen %s for retry write && verify: %s\n", partition, strerror(errno));
+ return -1;
+ }
}
if (!success) {