Propagate the merge failure code to SnapshotMergeStats. am: 6ac3d47 am: 4f94f1c am: 2ea8449

dvandercorp · android-build-merge-worker-robot · commit 2dcfe8bebebd · 2021-04-28T20:27:56.000Z
Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1675999 Change-Id: Iafea2b231da77bfb9297a2499f7249f102b1a035
diff --git a/aosp/cleanup_previous_update_action.cc b/aosp/cleanup_previous_update_action.cc
@@ -324,6 +324,7 @@ void CleanupPreviousUpdateAction::WaitForMergeOrSchedule() {
 
     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;
     }

Original file line number	Diff line number	Diff line change
`@@ -324,6 +324,7 @@ void CleanupPreviousUpdateAction::WaitForMergeOrSchedule() {`
`324`	`324`
`325`	`325`	`case UpdateState::MergeFailed: {`
`326`	`326`	`LOG(ERROR) << "Merge failed. Device may be corrupted.";`
	`327`	`+ merge_stats_->set_merge_failure_code(snapshot_->ReadMergeFailureCode());`
`327`	`328`	`processor_->ActionComplete(this, ErrorCode::kDeviceCorrupted);`
`328`	`329`	`return;`
`329`	`330`	`}`