From 72be156bec78e552330c6d94d2f26b517b8d69fb Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Fri, 21 Jul 2017 19:29:54 +0000
Subject: [PATCH] Revert "Revert "Update for less arguments in hidl toBinder.""

This reverts commit 243bcfda3ac35735a959f8abcc45186aba0af116.

(originally reverted due to merge conflicts)

Bug: 32172906
Test: hidl_test

Change-Id: I70fde3ffe0d2c67390f7152acedd45c39009a134
---
 core/jni/android_os_HwBinder.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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