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

mock_dynamic_partition_control.h

diff --git a/mock_dynamic_partition_control.h b/mock_dynamic_partition_control.h
index b3e0c24..169c265 100644
--- a/mock_dynamic_partition_control.h
+++ b/mock_dynamic_partition_control.h
@@ -42,7 +42,7 @@
       PreparePartitionsForUpdate,
       bool(uint32_t, uint32_t, const DeltaArchiveManifest&, bool, uint64_t*));
   MOCK_METHOD0(GetVirtualAbFeatureFlag, FeatureFlag());
-  MOCK_METHOD0(FinishUpdate, bool());
+  MOCK_METHOD1(FinishUpdate, bool(bool));
   MOCK_METHOD0(CleanupSuccessfulUpdate, ErrorCode());
   MOCK_METHOD3(GetCleanupPreviousUpdateAction,
                std::unique_ptr<AbstractAction>(
@@ -76,7 +76,7 @@
   MOCK_METHOD0(GetDynamicPartitionsFeatureFlag, FeatureFlag());
   MOCK_METHOD1(GetSuperPartitionName, std::string(uint32_t));
   MOCK_METHOD0(GetVirtualAbFeatureFlag, FeatureFlag());
-  MOCK_METHOD0(FinishUpdate, bool());
+  MOCK_METHOD1(FinishUpdate, bool(bool));
 
   void set_fake_mapped_devices(const std::set<std::string>& fake) override {
     DynamicPartitionControlAndroid::set_fake_mapped_devices(fake);