Use interfaceDescriptor instead of interfaceChain
wherever suits. Sementically, interfaceDescriptor
returns the first element of interfaceChain; use
interfaceDescriptor when the rest of the elements
aren't used.
Bug: 34136228
Test: hidl_test
Change-Id: Id7650788a00a37a6d0fcb574547371965ddf4a04
diff --git a/transport/include/hidl/HidlBinderSupport.h b/transport/include/hidl/HidlBinderSupport.h
index e948221..ba11937 100644
--- a/transport/include/hidl/HidlBinderSupport.h
+++ b/transport/include/hidl/HidlBinderSupport.h
@@ -323,9 +323,9 @@
if (ifacePtr->isRemote()) {
return ::android::hardware::IInterface::asBinder(static_cast<ProxyType *>(ifacePtr));
} else {
- std::string myDescriptor = getDescriptor(ifacePtr);
+ std::string myDescriptor = details::getDescriptor(ifacePtr);
if (myDescriptor.empty()) {
- // interfaceChain fails
+ // interfaceDescriptor fails
return nullptr;
}
auto func = gBnConstructorMap.get(myDescriptor, nullptr);
@@ -348,7 +348,7 @@
return new ProxyType(binderIface);
}
sp<IBase> base = static_cast<BnHwBase*>(binderIface.get())->getImpl();
- if (canCastInterface(base.get(), IType::descriptor)) {
+ if (details::canCastInterface(base.get(), IType::descriptor)) {
StubType* stub = static_cast<StubType*>(binderIface.get());
return stub->getImpl();
} else {