commit 219000b3b33d4e6719dbfd2fa6ca7504fa955863
author Yifan Hong <elsk@google.com> Tue Sep 10 19:23:19 2019 -0700
committer Yifan Hong <elsk@google.com> Wed Sep 11 14:38:00 2019 -0700
tree 855f84e25aa98e03d2f39b51956b8a453f1e3382
parent 0b1916f39e5fe7244502c9dd8d3fd36266e2e8f7

Add format() to MatrixInstance.

Test: libvintf_test
Test: vintf_object_test
Bug: 140832836
Change-Id: Ie2937521e6601353a362ba81de7f978ff062c079

MatrixInstance.cpp

diff --git a/MatrixInstance.cpp b/MatrixInstance.cpp
index f6eb548..fb1cb33 100644
--- a/MatrixInstance.cpp
+++ b/MatrixInstance.cpp
@@ -33,16 +33,21 @@
 
 MatrixInstance& MatrixInstance::operator=(MatrixInstance&&) noexcept = default;
 
-MatrixInstance::MatrixInstance(FqInstance&& fqInstance, VersionRange&& range, bool optional,
-                               bool isRegex)
-    : mFqInstance(std::move(fqInstance)),
+MatrixInstance::MatrixInstance(HalFormat format, FqInstance&& fqInstance, VersionRange&& range,
+                               bool optional, bool isRegex)
+    : mFormat(format),
+      mFqInstance(std::move(fqInstance)),
       mRange(std::move(range)),
       mOptional(optional),
       mIsRegex(isRegex) {}
 
-MatrixInstance::MatrixInstance(const FqInstance fqInstance, const VersionRange& range,
-                               bool optional, bool isRegex)
-    : mFqInstance(fqInstance), mRange(range), mOptional(optional), mIsRegex(isRegex) {}
+MatrixInstance::MatrixInstance(HalFormat format, const FqInstance fqInstance,
+                               const VersionRange& range, bool optional, bool isRegex)
+    : mFormat(format),
+      mFqInstance(fqInstance),
+      mRange(range),
+      mOptional(optional),
+      mIsRegex(isRegex) {}
 
 const std::string& MatrixInstance::package() const {
     return mFqInstance.getPackage();
@@ -56,6 +61,10 @@
     return mFqInstance.getInterface();
 }
 
+HalFormat MatrixInstance::format() const {
+    return mFormat;
+}
+
 bool MatrixInstance::optional() const {
     return mOptional;
 }