From 00a32314acb08eef5c76439d4535789fe23ed0b0 Mon Sep 17 00:00:00 2001
From: Akilesh Kailash <akailash@google.com>
Date: Mon, 2 Dec 2024 10:58:46 -0800
Subject: [PATCH] libsnapshot: Cleanup temp metadata during rollback

Bug: 380471512
Test: Test rollback and check metadata is cleared
Change-Id: I4ebd5d9842409fa32c58bb482ffc0066817a5a05
Signed-off-by: Akilesh Kailash <akailash@google.com>
---
 fs_mgr/libsnapshot/snapshot.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fs_mgr/libsnapshot/snapshot.cpp b/fs_mgr/libsnapshot/snapshot.cpp
index acabd6770..ecf567eb8 100644
--- a/fs_mgr/libsnapshot/snapshot.cpp
+++ b/fs_mgr/libsnapshot/snapshot.cpp
@@ -2404,6 +2404,9 @@ bool SnapshotManager::NeedSnapshotsInFirstStageMount() {
                 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.";