commit 62c7016f751ea1c13d2d26fa5966a64629081b05
author Steven Moreland <smoreland@google.com> Fri Feb 02 20:54:14 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 02 20:54:14 2018 +0000
tree 5a717e2c3162a6e35c61d524148e2e59d7d8e434
parent 401bc479cd58001de2ffe3ca9192bf9df59b2ed4
parent b25031a25edaaa1120d33a5e35b188016f450397

Merge "vts_ibase_test: Add push group." am: a10a7851fa
am: b25031a25e

Change-Id: Icf47572c310bd0a859021fdaed4400eae1c4a16a

transport/Android.mk

diff --git a/transport/Android.mk b/transport/Android.mk
index 8060f3b..8012835 100644
--- a/transport/Android.mk
+++ b/transport/Android.mk
@@ -58,5 +58,3 @@
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
 endif # TARGET_BUILD_PDK not true
-
-include $(LOCAL_PATH)/base/1.0/vts/functional/Android.mk

transport/HidlTransportUtils.cpp

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 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();