commit ea59f9c057940659973bae6eab9b79b6d038125f
author Steven Moreland <smoreland@google.com> Mon Mar 09 16:17:21 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 09 16:17:21 2020 +0000
tree ce925a3d2db1932aeb34d5ab9c620f798c5ea5c6
parent 8a7fdd8cd8237d75f5e6a2e649d9d47fe050328a
parent e518fc39f5656debfa66dde71b04edecefa4ee32

Merge "libhidl: allocate rarely used regex only if needed" into rvc-dev

transport/base/1.0/vts/functional/vts_ibase_test.cpp

diff --git a/transport/base/1.0/vts/functional/vts_ibase_test.cpp b/transport/base/1.0/vts/functional/vts_ibase_test.cpp
index b96e3b0..6372631 100644
--- a/transport/base/1.0/vts/functional/vts_ibase_test.cpp
+++ b/transport/base/1.0/vts/functional/vts_ibase_test.cpp
@@ -82,7 +82,7 @@
 std::mutex gDeclaredServiceHalMapMutex;
 
 void GetHal(const std::string& service, const FqInstance& instance) {
-    if (instance.getFqName() == android::gIBaseFqName) {
+    if (instance.getFqName().string() == IBase::descriptor) {
         return;
     }
 
@@ -157,7 +157,7 @@
                             << "Unable to parse interface: '" << debug_info.interfaceName.c_str();
                     FqInstance fqInstance;
                     ASSERT_TRUE(fqInstance.setTo(fqName, debug_info.instanceName.c_str()));
-                    if (fqInstance.getFqName() != android::gIBaseFqName) {
+                    if (fqInstance.getFqName().string() != IBase::descriptor) {
                         result[debug_info.pid].insert(fqInstance);
                     }
                 }