| commit | 2ea84498de8976154cd7301b1c9676e144e40186 | [log] [tgz] |
|---|---|---|
| author | David Anderson <dvander@google.com> | Wed Apr 28 20:11:46 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 28 20:11:46 2021 +0000 |
| tree | 178f9559fb504836dbe83aaf968243aa3071a9d8 | |
| parent | 41d7982a099536a1d4c4e9e6abad953af4a5728b [diff] | |
| parent | 4f94f1c1013117258a2ca781ba9f96303a588840 [diff] |
Propagate the merge failure code to SnapshotMergeStats. am: 6ac3d47472 am: 4f94f1c101 Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1675999 Change-Id: Id8640f0e4b966f52e5c84816a49d3e1c4be56322
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; }