Propagate the update compression status into SnapshotMergeStats. am: 9661fb3698
Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1573261
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I91be5717d0bbd9b279be825b6467b5f560e7eecc
diff --git a/aosp/cleanup_previous_update_action.cc b/aosp/cleanup_previous_update_action.cc
index 16cb9fe..6155be4 100644
--- a/aosp/cleanup_previous_update_action.cc
+++ b/aosp/cleanup_previous_update_action.cc
@@ -270,10 +270,11 @@
void CleanupPreviousUpdateAction::WaitForMergeOrSchedule() {
AcknowledgeTaskExecuted();
TEST_AND_RETURN(running_);
+ auto update_uses_compression = snapshot_->UpdateUsesCompression();
auto state = snapshot_->ProcessUpdateState(
std::bind(&CleanupPreviousUpdateAction::OnMergePercentageUpdate, this),
std::bind(&CleanupPreviousUpdateAction::BeforeCancel, this));
- merge_stats_->set_state(state);
+ merge_stats_->set_state(state, update_uses_compression);
switch (state) {
case UpdateState::None: {
@@ -403,7 +404,7 @@
LOG(WARNING) << "InitiateMerge failed.";
auto state = snapshot_->GetUpdateState();
- merge_stats_->set_state(state);
+ merge_stats_->set_state(state, snapshot_->UpdateUsesCompression());
if (state == UpdateState::Unverified) {
// We are stuck at unverified state. This can happen if the update has
// been applied, but it has not even been attempted yet (in libsnapshot,