commit 7b3910a58bd0b8d9f0bd316fad5776ef0a8494ba
author Yifan Hong <elsk@google.com> Tue Mar 24 17:47:32 2020 -0700
committer Yifan Hong <elsk@google.com> Fri Mar 27 23:05:13 2020 +0000
tree 849b427901ee0b22d7efd49f07ea236b8fc4650a
parent 37ae85653198123fc28a4ce1de25d2e56ee6a3a2

Allow forward merge on powerwash.

If package schedules powerwash, snapshots on a Virtual A/B device
will be deleted. Tell SnapshotManager to handle this case.

Test: apply downgrade package
Test: apply package with wipe
Test: apply package then manually wipe
Bug: 152094219
Change-Id: I8601b661924abcc82956788e2f33cdb70d71f778

common/dynamic_partition_control_stub.h

diff --git a/common/dynamic_partition_control_stub.h b/common/dynamic_partition_control_stub.h
index 679d028..d8e254e 100644
--- a/common/dynamic_partition_control_stub.h
+++ b/common/dynamic_partition_control_stub.h
@@ -40,7 +40,7 @@
                                   bool update,
                                   uint64_t* required_size) override;
 
-  bool FinishUpdate() override;
+  bool FinishUpdate(bool powerwash_required) override;
   std::unique_ptr<AbstractAction> GetCleanupPreviousUpdateAction(
       BootControlInterface* boot_control,
       PrefsInterface* prefs,