summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2017-07-21 19:52:04 +0000
committer android-build-merger <android-build-merger@google.com> 2017-07-21 19:52:04 +0000
commitd4d462857b6151e3b1bfbe068611a799985ea071 (patch)
treeca79fbfd3a7b6728cc6cae2cb4569b2692795bc1
parent379c317ab86c96202d1c7c7bdbb51b8b05f28fa7 (diff)
parent4e743f680ef0bcc945555ee2c6330001937ae178 (diff)
Merge "Revert "Update for less arguments in hidl toBinder."" am: 79994cb142 am: 16255fda63
am: 4e743f680e Change-Id: Iff1739cb98d1f978f6246bbd73a8163822e2e6c7
-rw-r--r--core/jni/android_os_HwBinder.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/android_os_HwBinder.cpp b/core/jni/android_os_HwBinder.cpp
index 1b14d2828702..81063204447f 100644
--- a/core/jni/android_os_HwBinder.cpp
+++ b/core/jni/android_os_HwBinder.cpp
@@ -383,7 +383,8 @@ static jobject JHwBinder_native_getService(
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);