commit 794075c575ebc9d08bbb2f5146e763f40b399291
author Tao Bao <tbao@google.com> Mon Dec 19 19:30:08 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Dec 19 19:30:08 2016 +0000
tree a6ac7f068f85d69c980ffa82cd2d5f585c58fada
parent fe98435fa96b86c8d9a52d0fd30b7ae368538b4b
parent 88bd5d59de100adce3f674ae9549caa120dcd6a3

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

Change-Id: Ia1127521eb2d1730f82be920886337c8d73635ff

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) {