commit 6950e02536ca247d35ff14cfb2214ab9463a9e87
author Yifan Hong <elsk@google.com> Tue Mar 24 17:47:32 2020 -0700
committer Yifan Hong <elsk@google.com> Fri Mar 27 16:12:48 2020 -0700
tree c9222d87fd7fcb12c4806560160e011f2af451d4
parent 3a3d0c121fd904ce8440260ee2f5d12ea09d12e2

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
(cherry picked from commit 7b3910a58bd0b8d9f0bd316fad5776ef0a8494ba)
Merged-In: I8601b661924abcc82956788e2f33cdb70d71f778

payload_consumer/postinstall_runner_action.cc

diff --git a/payload_consumer/postinstall_runner_action.cc b/payload_consumer/postinstall_runner_action.cc
index 0f48493..c08cfc2 100644
--- a/payload_consumer/postinstall_runner_action.cc
+++ b/payload_consumer/postinstall_runner_action.cc
@@ -341,7 +341,8 @@
   // steps succeeded.
   if (error_code == ErrorCode::kSuccess) {
     if (install_plan_.switch_slot_on_reboot) {
-      if (!boot_control_->GetDynamicPartitionControl()->FinishUpdate() ||
+      if (!boot_control_->GetDynamicPartitionControl()->FinishUpdate(
+              install_plan_.powerwash_required) ||
           !boot_control_->SetActiveBootSlot(install_plan_.target_slot)) {
         error_code = ErrorCode::kPostinstallRunnerError;
       } else {