| commit | 16a046a4d141c9aeda3ec86fa10ba92aa341b7e2 | [log] [tgz] |
|---|---|---|
| author | David Anderson <dvander@google.com> | Thu Jul 01 19:30:22 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 01 19:30:22 2021 +0000 |
| tree | 6402b55ea8ce3230e635d107dc0cccbcfb7b8309 | |
| parent | 316ee3c6bc8f2b3f4985e455aff2d8a8b2dd2532 [diff] | |
| parent | 4657407a32ba168e9dc49277c1ee20359169af9f [diff] |
Record the source build fingerprint in SnapshotMergeStats. am: 4657407a32 Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1749448 Change-Id: Idfe1d7e4ec93210e7befeccb6d1345a93a80b0c6
diff --git a/aosp/cleanup_previous_update_action.cc b/aosp/cleanup_previous_update_action.cc index 51bb083..aa24297 100644 --- a/aosp/cleanup_previous_update_action.cc +++ b/aosp/cleanup_previous_update_action.cc
@@ -419,6 +419,14 @@ merge_stats_->set_boot_complete_to_merge_start_time_ms( merge_start_time.count() - merge_stats_->boot_complete_time_ms()); + auto source_build_fingerprint = snapshot_->ReadSourceBuildFingerprint(); + merge_stats_->set_source_build_fingerprint(source_build_fingerprint); + + if (!merge_stats_->WriteState()) { + LOG(ERROR) << "Failed to write merge stats; record may be unreliable if " + "merge is interrupted."; + } + if (snapshot_->InitiateMerge()) { WaitForMergeOrSchedule(); return;