Merge "Parcel marshall error explain objects"

This commit is contained in:
Treehugger Robot
2022-07-07 18:51:21 +00:00
committed by Gerrit Code Review

View File

@@ -549,10 +549,10 @@ static jbyteArray android_os_Parcel_marshall(JNIEnv* env, jclass clazz, jlong na
return NULL; return NULL;
} }
// do not marshall if there are binder objects in the parcel
if (parcel->objectsCount()) if (parcel->objectsCount())
{ {
jniThrowException(env, "java/lang/RuntimeException", "Tried to marshall a Parcel that contained Binder objects."); jniThrowException(env, "java/lang/RuntimeException",
"Tried to marshall a Parcel that contains objects (binders or FDs).");
return NULL; return NULL;
} }