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

am: e81719dde3 Change-Id: I1a833b07b4baa45f23930b4231c35fba2c2ac6ef
2016-12-19 19:24:06 +00:00
parent 9a707b08ef e81719dde3
commit b0337774b2
1 changed files with 11 additions and 0 deletions
--- 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) {