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