summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2017-07-21 18:56:08 +0000
committer android-build-merger <android-build-merger@google.com> 2017-07-21 18:56:08 +0000
commit4fe88747fc5ea18baf20c097f0f362706b2b4912 (patch)
tree7d893b1b027d35588a70415d603ce32886eb56b5
parent10fcc1cad5ecf56725fde1aa1a8dab16861b7bf3 (diff)
parent8d2396cbbee6f7f5e5ff0a4bf44b7ce3fd4723ab (diff)
Merge "Merge "Update for less arguments in hidl toBinder." am: 602b7be04e am: b167ed08cc am: 5f04958a73 am: 88901bd0df" into oc-mr1-dev-plus-aosp
am: 8d2396cbbe Change-Id: I4ed363468d199a69f6594f13626b3f5697f78759
-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);