ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Treehugger Robot 2024-10-09 07:11:03 +00:00 • committed by Gerrit Code Review
commit 5a6ab7d869
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fs_mgr/libsnapshot/snapshotctl.cpp
View file

@ -105,7 +105,7 @@ class MapSnapshots {
bool FinishSnapshotWrites(); bool FinishSnapshotWrites();
bool UnmapCowImagePath(std::string& name); bool UnmapCowImagePath(std::string& name);
bool DeleteSnapshots(); bool DeleteSnapshots();
bool CleanupSnapshot() { return sm_->PrepareDeviceToBootWithoutSnapshot(); } bool CleanupSnapshot();
bool BeginUpdate(); bool BeginUpdate();
bool ApplyUpdate(); bool ApplyUpdate();
@ -495,6 +495,11 @@ bool MapSnapshots::UnmapCowImagePath(std::string& name) {
return sm_->UnmapCowImage(name); return sm_->UnmapCowImage(name);
} }
bool MapSnapshots::CleanupSnapshot() {
sm_ = SnapshotManager::New();
return sm_->PrepareDeviceToBootWithoutSnapshot();
}
bool MapSnapshots::DeleteSnapshots() { bool MapSnapshots::DeleteSnapshots() {
sm_ = SnapshotManager::New(); sm_ = SnapshotManager::New();
lock_ = sm_->LockExclusive(); lock_ = sm_->LockExclusive();