| commit | 786bb39d838380f0af377ffc2e46f6f4efc56870 | [log] [tgz] |
|---|---|---|
| author | Kelvin Zhang <zhangkelvin@google.com> | Mon Mar 22 19:51:07 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 22 19:51:07 2021 +0000 |
| tree | 5a8fdd879953a43d0fb9d1f158ef79df832f370e | |
| parent | 607f9fb4399c428720d198bb0c3f74251dd1405e [diff] | |
| parent | f7ef12a569a4aefedb7f3740c75fdd5bbd24759d [diff] |
Unmap all partitions after postinstall finishes am: f7ef12a569 Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1648727 Change-Id: I76617236b8799c88dd83cb503177e91c9005f8ab
diff --git a/aosp/dynamic_partition_control_android.cc b/aosp/dynamic_partition_control_android.cc index 4220445..e1f86d8 100644 --- a/aosp/dynamic_partition_control_android.cc +++ b/aosp/dynamic_partition_control_android.cc
@@ -283,6 +283,7 @@ } bool DynamicPartitionControlAndroid::UnmapAllPartitions() { + snapshot_->UnmapAllSnapshots(); if (mapped_devices_.empty()) { return false; }
diff --git a/payload_consumer/postinstall_runner_action.cc b/payload_consumer/postinstall_runner_action.cc index e3e305b..283a6ba 100644 --- a/payload_consumer/postinstall_runner_action.cc +++ b/payload_consumer/postinstall_runner_action.cc
@@ -400,6 +400,10 @@ if (HasOutputPipe()) { SetOutputObject(install_plan_); } + auto dynamic_control = boot_control_->GetDynamicPartitionControl(); + CHECK(dynamic_control); + dynamic_control->UnmapAllPartitions(); + LOG(INFO) << "Unmapped all partitions."; } void PostinstallRunnerAction::SuspendAction() {