diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2021-06-09 05:18:08 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2021-06-09 05:18:08 -0700 |
| commit | f476d74eefab00e5b40d54513a2621e664c70ddf (patch) | |
| tree | 01ec931931503ed80f181b2d85efb5df0079e4ba /aosp/cleanup_previous_update_action.cc | |
| parent | 0482fa15f58c1de5ead9e0e3e2aa1d593d18e6c2 (diff) | |
| parent | ac7fc8e1debff1f57afe79f144d8d16a1a0ec470 (diff) | |
Merge ac7fc8e1debff1f57afe79f144d8d16a1a0ec470 on remote branch
Change-Id: I2cd41cefedfd492f9e20617ad9929ebf1cdde79e
Diffstat (limited to 'aosp/cleanup_previous_update_action.cc')
| -rw-r--r-- | aosp/cleanup_previous_update_action.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/aosp/cleanup_previous_update_action.cc b/aosp/cleanup_previous_update_action.cc index 68954f6f..dde6b89a 100644 --- 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; } @@ -492,7 +493,8 @@ void CleanupPreviousUpdateAction::ReportMergeStats() { report.total_cow_size_bytes(), report.estimated_cow_size_bytes(), report.boot_complete_time_ms(), - report.boot_complete_to_merge_start_time_ms()); + report.boot_complete_to_merge_start_time_ms(), + static_cast<int32_t>(report.merge_failure_code())); #endif } |