commit 326534aace6f05be2578e8c6abd4692efe9e2db0
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Dec 02 22:31:01 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 02 22:31:01 2024 +0000
tree 733cbfa5007375997791c66322e8f7141d5f520e
parent 85050a06e15897b0326dfeefa6df78820f408e86
parent 00a32314acb08eef5c76439d4535789fe23ed0b0

Merge "libsnapshot: Cleanup temp metadata during rollback" into main

fs_mgr/libsnapshot/snapshot.cpp

diff --git a/fs_mgr/libsnapshot/snapshot.cpp b/fs_mgr/libsnapshot/snapshot.cpp
index acabd67..ecf567e 100644
--- a/fs_mgr/libsnapshot/snapshot.cpp
+++ b/fs_mgr/libsnapshot/snapshot.cpp
@@ -2404,6 +2404,9 @@
                 PLOG(ERROR) << "Unable to write rollback indicator: " << path;
             } else {
                 LOG(INFO) << "Rollback detected, writing rollback indicator to " << path;
+                if (device_->IsTempMetadata()) {
+                    CleanupScratchOtaMetadataIfPresent();
+                }
             }
         }
         LOG(INFO) << "Not booting from new slot. Will not mount snapshots.";