Merge tag 'android-15.0.0_r5' of https://android.googlesource.com/platform/system/update_engine into HEAD
Android 15.0.0 release 5
Change-Id: Ibdd1b557854579636db54fa1679b3f11dcc76cd6
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZyvepAAKCRDorT+BmrEO
# eHKEAJ4lCCoIBOWeCe3R6S0HmLqoOo+TyQCdEYUSvtd0TwskFpy/W4BZMG8Rucc=
# =g2ei
# -----END PGP SIGNATURE-----
# gpg: Signature faite le mer 06 nov 2024 16:24:52 EST
# gpg: avec la clef DSA 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Impossible de vérifier la signature : Pas de clef publique
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;