summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-03-07 03:03:46 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-03-07 03:03:46 +0000
commite288743f3b962dcd135c8f477e2b7f211e18d267 (patch)
treeb7500c0021f0cf4be62bb4a7ebf6432d8ce07ccb
parent7013a707f571c9bbc1142e4b994fc7b69d48e2b1 (diff)
parent8a7fdd8cd8237d75f5e6a2e649d9d47fe050328a (diff)
downloadplatform_system_libhidl-e288743f3b962dcd135c8f477e2b7f211e18d267.tar.gz
platform_system_libhidl-e288743f3b962dcd135c8f477e2b7f211e18d267.tar.bz2
platform_system_libhidl-e288743f3b962dcd135c8f477e2b7f211e18d267.zip
Snap for 6272866 from 8a7fdd8cd8237d75f5e6a2e649d9d47fe050328a to rvc-release
Change-Id: Ic12c79e6bba81ac25ea2fa8a509185b7f2bffb6e
-rw-r--r--transport/base/1.0/vts/functional/vts_ibase_test.cpp4
1 files changed, 2 insertions, 2 deletions
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 b96e3b04..63726318 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::map<std::string, std::vector<Hal>> gDeclaredServiceHalMap;
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 @@ class VtsHalBaseV1_0TargetTest : public ::testing::Test {
<< "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);
}
}