Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38d40238 authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "libsnapshot: Propagate merge phase across merge failures." am: d32f5df7 am: 82d0ee6b 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1770177

Change-Id: I311e080714ffdfb7bc4b067dd50e3c1548369b75
parents 96daf3b7 82d0ee6b

fs_mgr/libsnapshot/snapshot.cpp

+1 −0
Original line number Diff line number Diff line
@@ -2530,6 +2530,7 @@ bool SnapshotManager::WriteUpdateState(LockedFile* lock, UpdateState state, 
        SnapshotUpdateStatus old_status = ReadSnapshotUpdateStatus(lock);

        status.set_compression_enabled(old_status.compression_enabled());

        status.set_source_build_fingerprint(old_status.source_build_fingerprint());

        status.set_merge_phase(old_status.merge_phase());

    }

    return WriteSnapshotUpdateStatus(lock, status);

}