commit 5a6ab7d869b4af7e707b6718a9e4eb568607027b
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Oct 09 07:11:03 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 09 07:11:03 2024 +0000
tree 31f5e55b1f0477d74c6d7e3dcece5cb317163cee
parent 5c8ebb25707366044affb69594da1d65780a19dd
parent e69b2d427754fa1d9d2758c8068f0adda75095bf

Merge "snapshotctl: Initialize snapshot pointer when reverting snapshots" into main

fs_mgr/libsnapshot/snapshotctl.cpp

diff --git a/fs_mgr/libsnapshot/snapshotctl.cpp b/fs_mgr/libsnapshot/snapshotctl.cpp
index 97a8cb2..46de991 100644
--- a/fs_mgr/libsnapshot/snapshotctl.cpp
+++ b/fs_mgr/libsnapshot/snapshotctl.cpp
@@ -105,7 +105,7 @@
     bool FinishSnapshotWrites();
     bool UnmapCowImagePath(std::string& name);
     bool DeleteSnapshots();
-    bool CleanupSnapshot() { return sm_->PrepareDeviceToBootWithoutSnapshot(); }
+    bool CleanupSnapshot();
     bool BeginUpdate();
     bool ApplyUpdate();
 
@@ -495,6 +495,11 @@
     return sm_->UnmapCowImage(name);
 }
 
+bool MapSnapshots::CleanupSnapshot() {
+    sm_ = SnapshotManager::New();
+    return sm_->PrepareDeviceToBootWithoutSnapshot();
+}
+
 bool MapSnapshots::DeleteSnapshots() {
     sm_ = SnapshotManager::New();
     lock_ = sm_->LockExclusive();