diff --git a/core/jni/android_os_Parcel.cpp b/core/jni/android_os_Parcel.cpp index acadac78ce135..bb4ab39a59d18 100644 --- a/core/jni/android_os_Parcel.cpp +++ b/core/jni/android_os_Parcel.cpp @@ -549,6 +549,11 @@ static jbyteArray android_os_Parcel_marshall(JNIEnv* env, jclass clazz, jlong na return NULL; } + if (parcel->isForRpc()) { + jniThrowException(env, "java/lang/RuntimeException", "Tried to marshall an RPC Parcel."); + return NULL; + } + if (parcel->objectsCount()) { jniThrowException(env, "java/lang/RuntimeException",