commit 66b1fe54293f3459eb35d56c15a6b65e579d1344
author android-build-team Robot <android-build-team-robot@google.com> Thu Apr 29 01:10:55 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Apr 29 01:10:55 2021 +0000
tree f3641a96c2cbf4376f647c43fe9264cf32c0657f
parent 428d45382952dcee4b73f309e767c4f9335854ed
parent 32dbec3436ed376a6ef4b741e601cee2f6a8c847

Snap for 7321546 from 32dbec3436ed376a6ef4b741e601cee2f6a8c847 to sc-v2-release

Change-Id: I59c40678030a6902da73eb366fe6ecef85d85fc4

aosp/cleanup_previous_update_action.cc

diff --git a/aosp/cleanup_previous_update_action.cc b/aosp/cleanup_previous_update_action.cc
index 68954f6..dde6b89 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;
     }
@@ -492,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
 }