commit 59066194feeaf5d74d8481bb4c0a5ea812e1805c
author xunchang <xunchang@google.com> Fri Apr 26 10:39:00 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Apr 26 10:39:00 2019 -0700
tree 2deb8ae3290a615d20175424df870bef4f9e2e91
parent 1e882f6ff6763e92582dcdf4f4d806bae840d260
parent a92b1a27c7474b281761e1038d3481fccd7ac536

Set the block device to be writable before writing verity data am: 32e82044ba
am: a92b1a27c7

Change-Id: Ifff717e244509d2d46e05d0c47a6ef62eb7a32a7

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);