commit 737e6cc6000829094b4d2a5bffe1b227a07d11f8
author Ng Zhi An <zhin@google.com> Wed Jan 23 21:54:11 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Jan 23 21:54:11 2019 -0800
tree 1bfcc933fd0638982b5071793f038caab9982b32
parent 73a460b06fc0027cec56c52c6766abb79d2fdc5e
parent a04ff295cfcce4770cb4ca6a3189df458810c356

Merge "Check that install file exists before unlink" am: 05d48050c1
am: a04ff295cf

Change-Id: I00c9323e3c774f25d4c746e439d8c50bb75935b6

recovery-persist.cpp

diff --git a/recovery-persist.cpp b/recovery-persist.cpp
index ebb42d2..e2a6699 100644
--- a/recovery-persist.cpp
+++ b/recovery-persist.cpp
@@ -158,7 +158,7 @@
       // Collects and reports the non-a/b update metrics from last_install; and removes the file
       // to avoid duplicate report.
       report_metrics_from_last_install(LAST_INSTALL_FILE_IN_CACHE);
-      if (unlink(LAST_INSTALL_FILE_IN_CACHE) == -1) {
+      if (access(LAST_INSTALL_FILE_IN_CACHE, F_OK) && unlink(LAST_INSTALL_FILE_IN_CACHE) == -1) {
         PLOG(ERROR) << "Failed to unlink " << LAST_INSTALL_FILE_IN_CACHE;
       }
 
@@ -182,7 +182,7 @@
     // /data/misc/recovery from pmsg. Looks for the sideload history only.
     if (!has_cache) {
       report_metrics_from_last_install(LAST_INSTALL_FILE);
-      if (unlink(LAST_INSTALL_FILE) == -1) {
+      if (access(LAST_INSTALL_FILE, F_OK) && unlink(LAST_INSTALL_FILE) == -1) {
         PLOG(ERROR) << "Failed to unlink " << LAST_INSTALL_FILE;
       }
     }