commit f94d7c1462fed793a470daf5da3cf19de8288b1a
author android-build-team Robot <android-build-team-robot@google.com> Tue Apr 30 03:08:23 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Apr 30 03:08:23 2019 +0000
tree 904b1a546cbcd8393a95dacfe394eb5adfcab087
parent c50159b1da497260d1b2b4d8f7d64ff6034fd295
parent f6fd73661bebb7fec2a672da29379a7fe4e6c0eb

Snap for 5515452 from f6fd73661bebb7fec2a672da29379a7fe4e6c0eb to qt-release

Change-Id: I52ab5a8f24ec95dc0ba572261a49e8a1f14bf7e7

payload_consumer/verity_writer_android.cc

diff --git a/payload_consumer/verity_writer_android.cc b/payload_consumer/verity_writer_android.cc
index 06d1489..d5437b6 100644
--- a/payload_consumer/verity_writer_android.cc
+++ b/payload_consumer/verity_writer_android.cc
@@ -41,6 +41,9 @@
 bool VerityWriterAndroid::Init(const InstallPlan::Partition& partition) {
   partition_ = &partition;
 
+  if (partition_->hash_tree_size != 0 || partition_->fec_size != 0) {
+    utils::SetBlockDeviceReadOnly(partition_->target_path, false);
+  }
   if (partition_->hash_tree_size != 0) {
     auto hash_function =
         HashTreeBuilder::HashFunction(partition_->hash_tree_algorithm);