summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2017-11-03 16:18:19 -0700
committerNikoli Cartagena <dargeren@google.com>2017-11-28 21:27:37 -0800
commitf5f59d21b07d5ed9db6f0ebadc3412cbf723da48 (patch)
treed484fd8c77147e3b8d4c60ecfd1edc05c6c5982d
parentf3ff79119179e1787d1652e8f4611b3a4e62ed88 (diff)
downloadlibhidl-f5f59d21b07d5ed9db6f0ebadc3412cbf723da48.tar.gz
canCastInterface: always return true for IBase
Don't do a binder call for passing interface around, especially since every HIDL thing is already IBase. Bug: 68217907 Test: hidl's run_all_device_tests, boot + camera/YT sanity Merged-In: Ic195e9c19f181828296c515a3004c75daccdd03f Change-Id: Ic195e9c19f181828296c515a3004c75daccdd03f (cherry picked from commit b2bf30d7009674938a96ff9ae87a30e9ab260dc6)
-rw-r--r--transport/HidlTransportUtils.cpp15
1 files changed, 12 insertions, 3 deletions
diff --git a/transport/HidlTransportUtils.cpp b/transport/HidlTransportUtils.cpp
index eda9b8a..4e952eb 100644
--- a/transport/HidlTransportUtils.cpp
+++ b/transport/HidlTransportUtils.cpp
@@ -16,16 +16,25 @@
#include <hidl/HidlTransportUtils.h>
+#include <android/hidl/base/1.0/IBase.h>
+
namespace android {
namespace hardware {
namespace details {
-Return<bool> canCastInterface(::android::hidl::base::V1_0::IBase* interface,
- const char* castTo, bool emitError) {
+using ::android::hidl::base::V1_0::IBase;
+
+Return<bool> canCastInterface(IBase* interface, const char* castTo, bool emitError) {
if (interface == nullptr) {
return false;
}
+ // b/68217907
+ // Every HIDL interface is a base interface.
+ if (std::string(IBase::descriptor) == castTo) {
+ return true;
+ }
+
bool canCast = false;
auto chainRet = interface->interfaceChain([&](const hidl_vec<hidl_string> &types) {
for (size_t i = 0; i < types.size(); i++) {
@@ -46,7 +55,7 @@ Return<bool> canCastInterface(::android::hidl::base::V1_0::IBase* interface,
return canCast;
}
-std::string getDescriptor(::android::hidl::base::V1_0::IBase* interface) {
+std::string getDescriptor(IBase* interface) {
std::string myDescriptor{};
auto ret = interface->interfaceDescriptor([&](const hidl_string &types) {
myDescriptor = types.c_str();