commit bd69a74677add4fe8ad17b505b9921c5103899fc
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 28 20:45:54 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 28 20:45:54 2021 +0000
tree f2fbeabda73f06f69f2fbda1ac9fae7e4bfeaa9e
parent be17619cccc161a48a9bcf7b03384c32e13492db
parent f2e1f20fd78f9c5ff8e4eff5417a4d97c8005b06

Merge "Add VerifyMergeOps() to CowReader interface"

fs_mgr/libsnapshot/include/libsnapshot/cow_reader.h

diff --git a/fs_mgr/libsnapshot/include/libsnapshot/cow_reader.h b/fs_mgr/libsnapshot/include/libsnapshot/cow_reader.h
index 4d09be9..143f73c 100644
--- a/fs_mgr/libsnapshot/include/libsnapshot/cow_reader.h
+++ b/fs_mgr/libsnapshot/include/libsnapshot/cow_reader.h
@@ -68,6 +68,7 @@
 
     // Return the file footer.
     virtual bool GetFooter(CowFooter* footer) = 0;
+    virtual bool VerifyMergeOps() = 0;
 
     // Return the last valid label
     virtual bool GetLastLabel(uint64_t* label) = 0;
@@ -101,7 +102,7 @@
     virtual void Next() = 0;
 };
 
-class CowReader : public ICowReader {
+class CowReader final : public ICowReader {
   public:
     CowReader();
     ~CowReader() { owned_fd_ = {}; }
@@ -112,7 +113,7 @@
     bool Parse(android::base::borrowed_fd fd, std::optional<uint64_t> label = {});
 
     bool InitForMerge(android::base::unique_fd&& fd);
-    bool VerifyMergeOps();
+    bool VerifyMergeOps() override;
 
     bool GetHeader(CowHeader* header) override;
     bool GetFooter(CowFooter* footer) override;