summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2017-07-21 19:43:34 +0000
committer android-build-merger <android-build-merger@google.com> 2017-07-21 19:43:34 +0000
commit4e743f680ef0bcc945555ee2c6330001937ae178 (patch)
tree64b3447db1fb801c7718aab9bc97b5d287981a41
parent5f04958a7365a3a9fe96dcb99b7bdd6b6fdb0158 (diff)
parent16255fda639eab872a974dc404b289c6514210c8 (diff)
Merge "Revert "Update for less arguments in hidl toBinder."" am: 79994cb142
am: 16255fda63 Change-Id: I6e295f30bef2de7fe1840da821db7ea4d8ef72ec
-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);