diff options
| author | 2022-07-07 19:36:57 +0000 | |
|---|---|---|
| committer | 2022-07-07 19:36:57 +0000 | |
| commit | bba040da2ed0f0cd08006157fc48617d34abd664 (patch) | |
| tree | f5a6db63349be9b1a4eecb11c83b5799f9d8df99 | |
| parent | 76ce7d816ed67307b78c9ec765a4961096f461ec (diff) | |
| parent | a74545bf022ede3dc4a6079af0e3fec9f983f4e9 (diff) | |
Merge "Parcel marshall error explain objects" am: ccc3f24699 am: e9a5b3991e am: a74545bf02
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>
| -rw-r--r-- | core/jni/android_os_Parcel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android_os_Parcel.cpp b/core/jni/android_os_Parcel.cpp index 0d530f6aa2bb..acadac78ce13 100644 --- a/core/jni/android_os_Parcel.cpp +++ b/core/jni/android_os_Parcel.cpp @@ -549,10 +549,10 @@ static jbyteArray android_os_Parcel_marshall(JNIEnv* env, jclass clazz, jlong na return NULL; } - // do not marshall if there are binder objects in the parcel 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; } |