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

Merge "libsnapshot: Allow multiple calls to FinishedSnapshotWrites"

Browse source 
am: 09a0c98506

Change-Id: If259e2d4a9663575198aa1b14e13a4c9a50cf1e7
This commit is contained in:
Yifan Hong 2019-09-04 13:05:48 -07:00 • committed by android-build-merger
commit ab13ed350e
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs_mgr/libsnapshot/snapshot.cpp
View file

@ -152,7 +152,13 @@ bool SnapshotManager::FinishedSnapshotWrites() {
auto lock = LockExclusive();
if (!lock) return false;
if (ReadUpdateState(lock.get()) != UpdateState::Initiated) {
auto update_state = ReadUpdateState(lock.get());
if (update_state == UpdateState::Unverified) {
LOG(INFO) << "FinishedSnapshotWrites already called before. Ignored.";
return true;
}
if (update_state != UpdateState::Initiated) {
LOG(ERROR) << "Can only transition to the Unverified state from the Initiated state.";
return false;
}