diff options
author | Martijn Coenen <maco@google.com> | 2017-01-16 14:48:09 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-01-16 14:48:11 +0000 |
commit | c5e5442acd41d5632fd2cdf7fa9f1c87be4a2115 (patch) | |
tree | 6d7775d7ecbc540628236e432f0433b2f1233f18 | |
parent | 8df5bd1028ca34b34202b81775505fb016c9b2da (diff) | |
parent | 14fae06b603b431f341453ddbfa69bbc2e03c959 (diff) | |
download | base-c5e5442acd41d5632fd2cdf7fa9f1c87be4a2115.tar.gz |
Merge "Add nullable parameter to readEmbeddedBuffer."
-rw-r--r-- | core/java/android/os/HwParcel.java | 2 | ||||
-rw-r--r-- | core/jni/android_os_HwParcel.cpp | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/core/java/android/os/HwParcel.java b/core/java/android/os/HwParcel.java index c7612d16d0c0..a265dd08a92f 100644 --- a/core/java/android/os/HwParcel.java +++ b/core/java/android/os/HwParcel.java @@ -212,7 +212,7 @@ public class HwParcel { public native final HwBlob readBuffer(); public native final HwBlob readEmbeddedBuffer( - long parentHandle, long offset); + long parentHandle, long offset, boolean nullable); public native final void writeBuffer(HwBlob blob); diff --git a/core/jni/android_os_HwParcel.cpp b/core/jni/android_os_HwParcel.cpp index aefdc84b1912..1bd233313ca3 100644 --- a/core/jni/android_os_HwParcel.cpp +++ b/core/jni/android_os_HwParcel.cpp @@ -822,7 +822,8 @@ static jobject JHwParcel_native_readBuffer(JNIEnv *env, jobject thiz) { } static jobject JHwParcel_native_readEmbeddedBuffer( - JNIEnv *env, jobject thiz, jlong parentHandle, jlong offset) { + JNIEnv *env, jobject thiz, jlong parentHandle, jlong offset, + jboolean nullable) { hardware::Parcel *parcel = JHwParcel::GetNativeContext(env, thiz)->getParcel(); @@ -830,11 +831,15 @@ static jobject JHwParcel_native_readEmbeddedBuffer( const void *ptr; status_t status = - parcel->readEmbeddedBuffer(&childHandle, parentHandle, offset, &ptr); + parcel->readNullableEmbeddedBuffer(&childHandle, parentHandle, offset, + &ptr); if (status != OK) { jniThrowException(env, "java/util/NoSuchElementException", NULL); return 0; + } else if (status == OK && !nullable && ptr == nullptr) { + jniThrowException(env, "java/lang/NullPointerException", NULL); + return 0; } return JHwBlob::NewObject(env, ptr, childHandle); @@ -945,7 +950,7 @@ static JNINativeMethod gMethods[] = { { "readBuffer", "()L" PACKAGE_PATH "/HwBlob;", (void *)JHwParcel_native_readBuffer }, - { "readEmbeddedBuffer", "(JJ)L" PACKAGE_PATH "/HwBlob;", + { "readEmbeddedBuffer", "(JJZ)L" PACKAGE_PATH "/HwBlob;", (void *)JHwParcel_native_readEmbeddedBuffer }, { "writeBuffer", "(L" PACKAGE_PATH "/HwBlob;)V", |