diff options
| author | Brian Orr <brianorr@google.com> | 2021-05-10 11:39:59 -0700 |
|---|---|---|
| committer | Brian Orr <brianorr@google.com> | 2021-05-10 11:39:59 -0700 |
| commit | f79cb91b4218a68642c94a01defc0594e742b3f4 (patch) | |
| tree | 01ec931931503ed80f181b2d85efb5df0079e4ba /aosp/cleanup_previous_update_action.cc | |
| parent | d650df1d306a5a828e7b13a8cc954196fea44992 (diff) | |
| parent | 3d4e6e0d7ed2b609e0fe2b4d0fcb250808f97476 (diff) | |
Merge SP1A.210510.001
Change-Id: If7498b293041f2ae00fd93563417d60a0c13e7c9
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 } |