commit eb408f7b886ff8ec96092a9e367b058c361eadf4
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Aug 24 01:00:45 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Aug 24 01:00:45 2024 +0000
tree dd9aa5a40ef05505e61eb77dedbd30933b7d68ae
parent 9441d89992eaefa1d64b17896d569e6053a0124e
parent 888639125a32403a24511bd7f701c16c97c2dd6e

Merge cherrypicks of ['android-review.googlesource.com/3218418'] into 24Q3-release.

Change-Id: I31043aa055c0e9dd7952d78ec5316078debb623c

common/prefs.cc

diff --git a/common/prefs.cc b/common/prefs.cc
index af4d318..79d622f 100644
--- a/common/prefs.cc
+++ b/common/prefs.cc
@@ -240,6 +240,15 @@
     }
   }
 
+  if (std::filesystem::exists(GetTemporaryDir())) {
+    LOG(INFO)
+        << "Deleting temporary prefs, checkpoint transaction was interrupted";
+    if (!utils::DeleteDirectory(GetTemporaryDir().c_str())) {
+      LOG(ERROR) << "Failed to delete temporary prefs";
+      return false;
+    }
+  }
+
   // Delete empty directories. Ignore errors when deleting empty directories.
   DeleteEmptyDirectories(prefs_dir_);
   return true;