| commit | 9cae43aba800133a0b28e2a2471129fc2c88dc0c | [log] [tgz] |
|---|---|---|
| author | David Anderson <dvander@google.com> | Wed Apr 28 20:11:47 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 28 20:11:47 2021 +0000 |
| tree | bb2209e32f8b495d8abcc072742f3fcd282107d4 | |
| parent | 2ea84498de8976154cd7301b1c9676e144e40186 [diff] | |
| parent | c52e3d8d5fcc49b87def1af2f48ef7012259d406 [diff] |
Report merge failure code from SnapshotMergeReported. am: 906f9c3a22 am: c52e3d8d5f Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1682079 Change-Id: Ie10b263f50bfc68155ee5551ed1b064a75a032cb
diff --git a/aosp/cleanup_previous_update_action.cc b/aosp/cleanup_previous_update_action.cc index a902eaf..dde6b89 100644 --- a/aosp/cleanup_previous_update_action.cc +++ b/aosp/cleanup_previous_update_action.cc
@@ -493,7 +493,8 @@ 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 }