Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Parcel marshall error explain objects" am: ccc3f24699 am: e9a5b3991e am: a74545bf02

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2147258

Change-Id: Ifc9bfec9738ee6e548ff4b8b06bc40fc33d552d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-07-07 19:36:57 +00:00
committed by Automerger Merge Worker
parent 76ce7d816e a74545bf02
commit bba040da2e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android_os_Parcel.cpp
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;
} }