summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2018-01-19 05:30:07 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-01-19 05:30:07 +0000
commit52062b1f93b64677bc377cd63951a0672dd080e9 (patch)
tree84f2ce3d8b1191df690419bbb72dd42c6de9f797
parent6f180ea9c6f9ad8214a9a4103889b9957204ade6 (diff)
parentb9b7bfb02f71e94b5e8cb01da7e69cb6a012083b (diff)
Merge "HIDL: Check error value." am: 898137f817 am: 74426e9c2d
am: b9b7bfb02f Change-Id: I2b1506eee7c7a5f9557029abd2013c3b2ae0c523
-rw-r--r--core/jni/android_os_HwParcel.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/jni/android_os_HwParcel.cpp b/core/jni/android_os_HwParcel.cpp
index 9494fb8e7eef..061349aee96f 100644
--- a/core/jni/android_os_HwParcel.cpp
+++ b/core/jni/android_os_HwParcel.cpp
@@ -391,6 +391,10 @@ static void JHwParcel_native_verifySuccess(JNIEnv *env, jobject thiz) {
Status status;
status_t err = ::android::hardware::readFromParcel(&status, *parcel);
signalExceptionForError(env, err);
+
+ if (!status.isOk()) {
+ signalExceptionForError(env, UNKNOWN_ERROR, true /* canThrowRemoteException */);
+ }
}
static void JHwParcel_native_release(