Revert "Handle resume of VABC updates by emitting labels"
This reverts commit 24599af599acf74b71a555a8eeb827bedcd672b5.
Reason for revert: b/173009837
Test: 1. update_device.py ota.zip
--extra-headers="SWITCH_SLOT_ON_REBOOT=0"
2. update_device.py ota.zip
3. Verity that 2 did not re-start the entire update, only fs
verification and postinstall may re-run.
Bug: 173009837
Change-Id: Ia31025ebc68a5e6a72d7a0919994d614213270d1
diff --git a/payload_consumer/partition_writer_unittest.cc b/payload_consumer/partition_writer_unittest.cc
index ca2ef41..1ef4783 100644
--- a/payload_consumer/partition_writer_unittest.cc
+++ b/payload_consumer/partition_writer_unittest.cc
@@ -112,12 +112,8 @@
DeltaArchiveManifest manifest_{};
PartitionUpdate partition_update_{};
InstallPlan::Partition install_part_{};
- PartitionWriter writer_{partition_update_,
- install_part_,
- &dynamic_control_,
- kBlockSize,
- &prefs_,
- false};
+ PartitionWriter writer_{
+ partition_update_, install_part_, &dynamic_control_, kBlockSize, false};
};
// Test that the error-corrected file descriptor is used to read a partition
// when no hash is available for SOURCE_COPY but it falls back to the normal