Merge "getTransport checks both manifests."
diff --git a/transport/HidlPassthroughSupport.cpp b/transport/HidlPassthroughSupport.cpp
index 43724f9..981a139 100644
--- a/transport/HidlPassthroughSupport.cpp
+++ b/transport/HidlPassthroughSupport.cpp
@@ -21,6 +21,7 @@
namespace android {
namespace hardware {
+namespace details {
sp<::android::hidl::base::V1_0::IBase> wrapPassthrough(
sp<::android::hidl::base::V1_0::IBase> iface) {
@@ -28,7 +29,7 @@
// doesn't know how to handle it.
return iface;
}
- std::string myDescriptor = details::getDescriptor(iface.get());
+ std::string myDescriptor = getDescriptor(iface.get());
if (myDescriptor.empty()) {
// interfaceDescriptor fails
return nullptr;
@@ -40,6 +41,6 @@
return func(reinterpret_cast<void *>(iface.get()));
}
-
+} // namespace details
} // namespace hardware
} // namespace android
diff --git a/transport/include/hidl/HidlPassthroughSupport.h b/transport/include/hidl/HidlPassthroughSupport.h
index 2b2f86b..0a8f15b 100644
--- a/transport/include/hidl/HidlPassthroughSupport.h
+++ b/transport/include/hidl/HidlPassthroughSupport.h
@@ -21,6 +21,7 @@
namespace android {
namespace hardware {
+namespace details {
/*
* Wrap the given interface with the smallest BsChild possible. Will return the
@@ -29,6 +30,7 @@
sp<::android::hidl::base::V1_0::IBase> wrapPassthrough(
sp<::android::hidl::base::V1_0::IBase> iface);
+} // namespace details
} // namespace hardware
} // namespace android
diff --git a/transport/include/hidl/HidlTransportSupport.h b/transport/include/hidl/HidlTransportSupport.h
index 8476f47..8a2a70a 100644
--- a/transport/include/hidl/HidlTransportSupport.h
+++ b/transport/include/hidl/HidlTransportSupport.h
@@ -47,6 +47,8 @@
*/
void joinRpcThreadpool();
+namespace details {
+
// cast the interface IParent to IChild.
// Return nullptr if parent is null or any failure.
template<typename IChild, typename IParent, typename BpChild, typename BpParent>
@@ -69,6 +71,8 @@
return sp<IChild>(static_cast<IChild *>(parent.get()));
}
+} // namespace details
+
} // namespace hardware
} // namespace android