commit 79994cb142831ea90ca9c9089f8c4eea5172ecf9
author Steven Moreland <smoreland@google.com> Fri Jul 21 19:14:24 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 21 19:14:24 2017 +0000
tree 519c0d50a4436de4300988b02dc0d7e7448fa507
parent 602b7be04e1e71879978ed06b5fa1165e7082d36
parent 243bcfda3ac35735a959f8abcc45186aba0af116

Merge "Revert "Update for less arguments in hidl toBinder.""

core/jni/android_os_HwBinder.cpp

diff --git a/core/jni/android_os_HwBinder.cpp b/core/jni/android_os_HwBinder.cpp
index 132891e..8fd31fc 100644
--- a/core/jni/android_os_HwBinder.cpp
+++ b/core/jni/android_os_HwBinder.cpp
@@ -381,7 +381,8 @@
         return NULL;
     }
 
-    sp<hardware::IBinder> service = hardware::toBinder<hidl::base::V1_0::IBase>(ret);
+    sp<hardware::IBinder> service = hardware::toBinder<
+            hidl::base::V1_0::IBase, hidl::base::V1_0::BpHwBase>(ret);
 
     if (service == NULL) {
         signalExceptionForError(env, NAME_NOT_FOUND);