commit 4e92599704db4a3e29d4ad4a539586b019c99dfb
author Yifan Hong <elsk@google.com> Mon Jan 09 17:47:17 2017 -0800
committer Yifan Hong <elsk@google.com> Mon Jan 09 18:21:28 2017 -0800
tree 6b2f60a5b2ecc576a4e6bd2ec43ebee019745608
parent 33eb6bdc9db8d89a31131a937aef9dda764fb49f

Bp/n/sFoo -> Bp/n/sHwFoo

Bug: 33554989
Test: hidl_test
Change-Id: If46d3333f4dcc0a97010f13684bde219f07b3142

transport/include/hidl/HidlBinderSupport.h

diff --git a/transport/include/hidl/HidlBinderSupport.h b/transport/include/hidl/HidlBinderSupport.h
index cad68be..1ff925c 100644
--- a/transport/include/hidl/HidlBinderSupport.h
+++ b/transport/include/hidl/HidlBinderSupport.h
@@ -26,7 +26,7 @@
 #include <hwbinder/IPCThreadState.h>
 #include <hwbinder/Parcel.h>
 #include <hwbinder/ProcessState.h>
-#include <android/hidl/base/1.0/BnBase.h>
+#include <android/hidl/base/1.0/BnHwBase.h>
 // Defines functions for hidl_string, hidl_version, Status, hidl_vec, MQDescriptor,
 // etc. to interact with Parcel.
 
@@ -338,7 +338,7 @@
 template <typename IType, typename ProxyType, typename StubType>
 sp<IType> fromBinder(const sp<IBinder>& binderIface) {
     using ::android::hidl::base::V1_0::IBase;
-    using ::android::hidl::base::V1_0::BnBase;
+    using ::android::hidl::base::V1_0::BnHwBase;
 
     if (binderIface.get() == nullptr) {
         return nullptr;
@@ -346,7 +346,7 @@
     if (binderIface->localBinder() == nullptr) {
         return new ProxyType(binderIface);
     }
-    sp<IBase> base = static_cast<BnBase*>(binderIface.get())->getImpl();
+    sp<IBase> base = static_cast<BnHwBase*>(binderIface.get())->getImpl();
     if (canCastInterface(base.get(), IType::descriptor)) {
         StubType* stub = static_cast<StubType*>(binderIface.get());
         return stub->getImpl();