PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: a04ff295cf

Change-Id: I00c9323e3c774f25d4c746e439d8c50bb75935b6
This commit is contained in:
Ng Zhi An
2019-01-23 21:54:11 -08:00
committed by android-build-merger
parent 73a460b06f a04ff295cf
commit 737e6cc600
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recovery-persist.cpp
+2 -2
View File
@@ -158,7 +158,7 @@ int main(int argc, char **argv) {
// Collects and reports the non-a/b update metrics from last_install; and removes the file // Collects and reports the non-a/b update metrics from last_install; and removes the file
// to avoid duplicate report. // to avoid duplicate report.
report_metrics_from_last_install(LAST_INSTALL_FILE_IN_CACHE); 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; PLOG(ERROR) << "Failed to unlink " << LAST_INSTALL_FILE_IN_CACHE;
} }
@@ -182,7 +182,7 @@ int main(int argc, char **argv) {
// /data/misc/recovery from pmsg. Looks for the sideload history only. // /data/misc/recovery from pmsg. Looks for the sideload history only.
if (!has_cache) { if (!has_cache) {
report_metrics_from_last_install(LAST_INSTALL_FILE); 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; PLOG(ERROR) << "Failed to unlink " << LAST_INSTALL_FILE;
} }
} }