Merge SP1A.210329.001

Change-Id: I7d51aa0c38319764c1d6cfb93c2a7bb4e9f75652

1 files changed, 5 insertions, 2 deletions

diff --git a/common/dynamic_partition_control_interface.h b/common/dynamic_partition_control_interface.h
index 8b29c3b0..d5e1d8d2 100644
--- a/common/dynamic_partition_control_interface.h
+++ b/common/dynamic_partition_control_interface.h
@@ -165,12 +165,15 @@ class DynamicPartitionControlInterface {
       const std::string& unsuffixed_partition_name,
       const std::optional<std::string>&,
       bool is_append = false) = 0;
-  virtual FileDescriptorPtr OpenCowReader(
+  // Open a general purpose FD capable to reading and writing to COW. Note that
+  // writes must be block aligned.
+  virtual FileDescriptorPtr OpenCowFd(
       const std::string& unsuffixed_partition_name,
       const std::optional<std::string>&,
       bool is_append = false) = 0;
 
-  virtual bool IsDynamicPartition(const std::string& part_name) = 0;
+  virtual bool IsDynamicPartition(const std::string& part_name,
+                                  uint32_t slot) = 0;
 
   // Create virtual block devices for all partitions.
   virtual bool MapAllPartitions() = 0;