commit fece6ecab34d69d38f57419d2500017a7136083e
author Yifan Hong <elsk@google.com> Thu Jan 12 17:04:04 2017 -0800
committer Yifan Hong <elsk@google.com> Tue Jan 17 14:37:29 2017 -0800
tree 7a35de99d66fbcef71cfe0ca5d973f3837cf51b9
parent 677576012329e4f10a506b1f9623a2345dfbe93a

Cleanup FQName usage.

Bug: 32559427
Test: hidl_test
Change-Id: Ie5e234c102f8ad76ab24db9bce1630e2227562f6

FQName.cpp

diff --git a/FQName.cpp b/FQName.cpp
index 99e9f9a..254a5a4 100644
--- a/FQName.cpp
+++ b/FQName.cpp
@@ -72,6 +72,11 @@
       mName(name),
       mValueName(valueName) {
     setVersion(version);
+
+    // Check if this is actually a valid fqName
+    FQName other;
+    other.setTo(this->string());
+    CHECK(other.mValid && (*this) == other);
 }
 
 FQName::FQName(const FQName& other)
@@ -339,7 +344,11 @@
     return FQName(package(), version(), "types");
 }
 
-const FQName FQName::getTopLevelType() const {
+FQName FQName::getPackageAndVersion() const {
+    return FQName(package(), version(), "");
+}
+
+FQName FQName::getTopLevelType() const {
     auto idx = mName.find('.');
 
     if (idx == std::string::npos) {