commit b0337774b2926290018395a55a125af6094040e4
author Tao Bao <tbao@google.com> Mon Dec 19 19:24:06 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Dec 19 19:24:06 2016 +0000
tree 567c1e301e3e40486e427a0ce6bd9d02cd21f957
parent 9a707b08ef883723e564833c187c3e8bdf0f9953
parent e81719dde3d520c92ad000eff8a833a739668565

Merge "Bugfix:updater always retry apply patch failed,when memcpy failed."
am: e81719dde3

Change-Id: I1a833b07b4baa45f23930b4231c35fba2c2ac6ef

applypatch/applypatch.cpp

diff --git a/applypatch/applypatch.cpp b/applypatch/applypatch.cpp
index 95389da..8682e12 100644
--- a/applypatch/applypatch.cpp
+++ b/applypatch/applypatch.cpp
@@ -332,6 +332,17 @@
       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) {