commit 89c87af6d360cb40e6b49bb67bbe55901d133b11
author Kelvin Zhang <zhangkelvin@google.com> Tue Apr 27 18:53:47 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 27 18:53:47 2021 +0000
tree 2049c325d91d51ceca864cd52b612b769da702a6
parent 41ce01b7396ad927f617ca9d1ce56d5118cc661d
parent 433d6c4f856ab20f09f239936d9fa3da51e1011c

Unmmap all partitions after postinstall am: 433d6c4f85

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1662819

Change-Id: I032cf4fe9b3faf940e34f9a9a2efb8a0d490664e

payload_consumer/postinstall_runner_action.cc

diff --git a/payload_consumer/postinstall_runner_action.cc b/payload_consumer/postinstall_runner_action.cc
index 8f2d674..de7848b 100644
--- a/payload_consumer/postinstall_runner_action.cc
+++ b/payload_consumer/postinstall_runner_action.cc
@@ -383,6 +383,11 @@
     }
   }
 
+  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);
 
@@ -401,10 +406,6 @@
   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() {

payload_consumer/snapshot_extent_writer.h

diff --git a/payload_consumer/snapshot_extent_writer.h b/payload_consumer/snapshot_extent_writer.h
index c3c64cd..c3a948e 100644
--- a/payload_consumer/snapshot_extent_writer.h
+++ b/payload_consumer/snapshot_extent_writer.h
@@ -14,6 +14,9 @@
 // limitations under the License.
 //
 
+#ifndef UPDATE_ENGINE_SNAPSHOT_EXTENT_WRITER_H_
+#define UPDATE_ENGINE_SNAPSHOT_EXTENT_WRITER_H_
+
 #include <cstdint>
 #include <vector>
 
@@ -52,3 +55,5 @@
 };
 
 }  // namespace chromeos_update_engine
+
+#endif