commit 6ac3d47472158c2fc5be26965e74a9e5da143e11
author David Anderson <dvander@google.com> Wed Apr 14 19:40:24 2021 -0700
committer David Anderson <dvander@google.com> Wed Apr 28 19:39:31 2021 +0000
tree 178f9559fb504836dbe83aaf968243aa3071a9d8
parent 433d6c4f856ab20f09f239936d9fa3da51e1011c

Propagate the merge failure code to SnapshotMergeStats.

Bug: 185290850
Test: manual test
Change-Id: I094c705a5a275e289eddb8f42e68e08f56975c83

aosp/cleanup_previous_update_action.cc

diff --git a/aosp/cleanup_previous_update_action.cc b/aosp/cleanup_previous_update_action.cc
index 68954f6..a902eaf 100644
--- a/aosp/cleanup_previous_update_action.cc
+++ b/aosp/cleanup_previous_update_action.cc
@@ -324,6 +324,7 @@
 
     case UpdateState::MergeFailed: {
       LOG(ERROR) << "Merge failed. Device may be corrupted.";
+      merge_stats_->set_merge_failure_code(snapshot_->ReadMergeFailureCode());
       processor_->ActionComplete(this, ErrorCode::kDeviceCorrupted);
       return;
     }