commit 906f9c3a22c9489f67c3d70d0e00f901b2a6ca53
author David Anderson <dvander@google.com> Tue Apr 20 20:13:08 2021 -0700
committer David Anderson <dvander@google.com> Wed Apr 28 19:39:31 2021 +0000
tree bb2209e32f8b495d8abcc072742f3fcd282107d4
parent 6ac3d47472158c2fc5be26965e74a9e5da143e11

Report merge failure code from SnapshotMergeReported.

Bug: 185290850
Test: statsd_testdrive
Change-Id: I743ca357225140635aae7a0b77338d35e64298da

aosp/cleanup_previous_update_action.cc

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
 }