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

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

Change-Id: I4cf207ca6e18af162a8a58418b26b789bde587e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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;
     }