summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2017-07-21 23:34:17 +0000
committer android-build-merger <android-build-merger@google.com> 2017-07-21 23:34:17 +0000
commite3d791973021f68b1f9646f498cbf9eb14615fa6 (patch)
tree64b385d8f938d0351fddb3c69107ecb28e109032
parentcde37c8836e935fddd236d61138fd3955d26a14b (diff)
parentd37f13603ae82ac3f844c87bdb9cee2e26c3032d (diff)
Merge "Revert "Revert "Update for less arguments in hidl toBinder.""" am: e8341b6148
am: d37f13603a Change-Id: Ib0d843954f0a4854b6cea5ef3a4e0ad1ed4f29cb
-rw-r--r--core/jni/android_os_HwBinder.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/jni/android_os_HwBinder.cpp b/core/jni/android_os_HwBinder.cpp
index 81063204447f..1b14d2828702 100644
--- a/core/jni/android_os_HwBinder.cpp
+++ b/core/jni/android_os_HwBinder.cpp
@@ -383,8 +383,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);