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

Merge "libsnapshot: Fix missing return keyword in error path." into main am: c8ce6347db

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

Change-Id: I223ac6defc12d300f9cee99cdb6c46831487343f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Anderson 2023-08-03 19:52:25 +00:00 • committed by Automerger Merge Worker
commit c7b9ece0c4
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs_mgr/libsnapshot/include/libsnapshot/snapshot.h
View file

@ -624,7 +624,7 @@ class SnapshotManager final : public ISnapshotManager {
bool CollapseSnapshotDevice(LockedFile* lock, const std::string& name,
const SnapshotStatus& status);
struct MergeResult {
struct [[nodiscard]] MergeResult {
explicit MergeResult(UpdateState state,
MergeFailureCode failure_code = MergeFailureCode::Ok)
: state(state), failure_code(failure_code) {}

10
fs_mgr/libsnapshot/snapshot.cpp
View file

@ -1248,14 +1248,12 @@ auto SnapshotManager::CheckTargetMergeState(LockedFile* lock, const std::string&
GetMetadataPartitionState(*current_metadata, name) == MetadataPartitionState::Updated);
if (UpdateUsesUserSnapshots(lock)) {
std::string merge_status;
if (EnsureSnapuserdConnected()) {
// Query the snapshot status from the daemon
merge_status = snapuserd_client_->QuerySnapshotStatus(name);
} else {
MergeResult(UpdateState::MergeFailed, MergeFailureCode::QuerySnapshotStatus);
if (!EnsureSnapuserdConnected()) {
return MergeResult(UpdateState::MergeFailed, MergeFailureCode::QuerySnapshotStatus);
}
// Query the snapshot status from the daemon
const auto merge_status = snapuserd_client_->QuerySnapshotStatus(name);
if (merge_status == "snapshot-merge-failed") {
return MergeResult(UpdateState::MergeFailed, MergeFailureCode::UnknownTargetType);
}