| commit | 9d1c51e98307f0c79a7afda9e3cbee5cfebc8c08 | [log] [tgz] |
|---|---|---|
| author | David Anderson <dvander@google.com> | Tue Mar 09 19:57:44 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 09 19:57:44 2021 +0000 |
| tree | 575602523c24cee72c949bd8238fa68eda09c82e | |
| parent | 301af57c33cb04d8572923c2080f3db82aa4e4ca [diff] | |
| parent | ab2d6d18684a19e783dc60bbb1343ecbe55825f6 [diff] |
Collect more COW size data in SnapshotMergeReport. am: 8bda8216db am: ab2d6d1868 Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1616650 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic8db5eff990fa50b3fbbe9312b6a454171eba132
diff --git a/aosp/cleanup_previous_update_action.cc b/aosp/cleanup_previous_update_action.cc index 55c5a73..6eaa35b 100644 --- a/aosp/cleanup_previous_update_action.cc +++ b/aosp/cleanup_previous_update_action.cc
@@ -395,9 +395,9 @@ return; } - uint64_t cow_file_size; - if (snapshot_->InitiateMerge(&cow_file_size)) { - merge_stats_->set_cow_file_size(cow_file_size); + snapshot_->UpdateCowStats(merge_stats_); + + if (snapshot_->InitiateMerge()) { WaitForMergeOrSchedule(); return; }