commit 370815ef626efee48943e17c26aa08ad336eea6d
author Martijn Coenen <maco@google.com> Thu Dec 15 20:47:05 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 15 20:47:05 2016 +0000
tree cb2b181a6e4f1ecc3e40f4761caa01815d577b73
parent 33d3d19235da3ecc8801f01b8c1e69edf77d7b0e
parent df296fe1fa254ef0ca2ac40a9eb93b35d8f1c99c

Merge "HwBinder: Remove use of IHw class." am: 11ec22ab2a
am: df296fe1fa

Change-Id: I1c1069b5d2c1452f1cc9ee33725c3fa8f541966c

core/jni/android_os_HwBinder.cpp

diff --git a/core/jni/android_os_HwBinder.cpp b/core/jni/android_os_HwBinder.cpp
index 740b24d..2ae4a17 100644
--- a/core/jni/android_os_HwBinder.cpp
+++ b/core/jni/android_os_HwBinder.cpp
@@ -26,10 +26,11 @@
 #include <JNIHelp.h>
 #include <android/hidl/manager/1.0/IServiceManager.h>
 #include <android/hidl/base/1.0/IBase.h>
-#include <android/hidl/base/1.0/IHwBase.h>
+#include <android/hidl/base/1.0/BpBase.h>
 #include <android_runtime/AndroidRuntime.h>
 #include <hidl/ServiceManagement.h>
 #include <hidl/Status.h>
+#include <hidl/HidlTransportSupport.h>
 #include <hwbinder/ProcessState.h>
 #include <nativehelper/ScopedLocalRef.h>
 
@@ -241,14 +242,8 @@
     using android::hidl::manager::V1_0::IServiceManager;
 
     sp<hardware::IBinder> binder = JHwBinder::GetNativeContext(env, thiz);
-
-    sp<hidl::base::V1_0::IBase> base = hidl::base::V1_0::IHwBase::asInterface(binder);
-    if (base.get() == nullptr) {
-        LOG(ERROR) << "IBinder object cannot be casted to the base interface.";
-        signalExceptionForError(env, UNKNOWN_ERROR);
-        return;
-    }
-
+    /* TODO(b/33440494) this is not right */
+    sp<hidl::base::V1_0::IBase> base = new hidl::base::V1_0::BpBase(binder);
     bool ok = hardware::defaultServiceManager()->add(
                 interfaceChain,
                 serviceName,
@@ -300,7 +295,7 @@
             serviceName,
             [&service](sp<hidl::base::V1_0::IBase> out) {
                 service = hardware::toBinder<
-                        hidl::base::V1_0::IBase, hidl::base::V1_0::IHwBase
+                        hidl::base::V1_0::IBase, hidl::base::V1_0::BpBase
                     >(out);
             });