summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2017-07-21 20:04:46 +0000
committer android-build-merger <android-build-merger@google.com> 2017-07-21 20:04:46 +0000
commit3447811b949b85494825c205b70640db7644a70c (patch)
treead2ac2f15da8b041762aedcfca93bde560bb162b
parent4486a431579b6890b5e0a3ed35d1b820807a156d (diff)
parentf2bbdf9280498454073df9305beb75308b4c7ce7 (diff)
Merge "Revert "Update for less arguments in hidl toBinder."" am: 79994cb142 am: 16255fda63 am: 4e743f680e am: d4d462857b
am: f2bbdf9280 Change-Id: I397a8bd20a6fba62cfa528c5463dbaaaf2572460
-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);