summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2020-10-06 22:14:30 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-10-06 22:14:30 +0000
commit12f0a17d5306502cfe54780d2c16afd7ff48e185 (patch)
treeab0aa34ced9ffc35ad5e50ddc525acfe3b47bf2c
parentb6697b2a32d6e77eaa1786dd850b27e5a04e8ae9 (diff)
parente00f2bab8d3e7fb0db9861f1a654eab254dd6b59 (diff)
Merge "HIDL: unsilence error for local Java binder" am: d806764162 am: bedff86e1a am: 9555aa4dd5 am: e00f2bab8d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1445875 Change-Id: Ieed425be6a31b19792d1e02c1e735a8a473a5a2f
-rw-r--r--core/jni/android_os_HwParcel.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/jni/android_os_HwParcel.cpp b/core/jni/android_os_HwParcel.cpp
index ff336ee64b54..4c4443fc29c3 100644
--- a/core/jni/android_os_HwParcel.cpp
+++ b/core/jni/android_os_HwParcel.cpp
@@ -990,6 +990,8 @@ static jobject JHwParcel_native_readStrongBinder(JNIEnv *env, jobject thiz) {
}
if (!validateCanUseHwBinder(binder)) {
+ jniThrowException(env, "java/lang/IllegalArgumentException",
+ "Local binder is not supported in Java");
return nullptr;
}