Don't unmap partitions if they weren't mapped am: 24287c3fb1
Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/2480296
Change-Id: I74e430019f8b4fd4f2237226fac2c2d6831bead2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/payload_consumer/postinstall_runner_action.cc b/payload_consumer/postinstall_runner_action.cc
index 25736ee..6beca56 100644
--- a/payload_consumer/postinstall_runner_action.cc
+++ b/payload_consumer/postinstall_runner_action.cc
@@ -202,7 +202,7 @@
void PostinstallRunnerAction::PerformPartitionPostinstall() {
if (install_plan_.download_url.empty()) {
- LOG(INFO) << "Skipping post-install during rollback";
+ LOG(INFO) << "Skipping post-install";
return CompletePostinstall(ErrorCode::kSuccess);
}
@@ -430,6 +430,12 @@
}
void PostinstallRunnerAction::CompletePostinstall(ErrorCode error_code) {
+ if (!install_plan_.partitions.empty()) {
+ auto dynamic_control = boot_control_->GetDynamicPartitionControl();
+ CHECK(dynamic_control);
+ dynamic_control->UnmapAllPartitions();
+ LOG(INFO) << "Unmapped all partitions.";
+ }
// We only attempt to mark the new slot as active if all the postinstall
// steps succeeded.
if (error_code == ErrorCode::kSuccess) {
@@ -449,11 +455,6 @@
}
}
- auto dynamic_control = boot_control_->GetDynamicPartitionControl();
- CHECK(dynamic_control);
- dynamic_control->UnmapAllPartitions();
- LOG(INFO) << "Unmapped all partitions.";
-
ScopedActionCompleter completer(processor_, this);
completer.set_code(error_code);