Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bba040da authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Parcel marshall error explain objects" am: ccc3f246 am: e9a5b399 am: a74545bf 

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



Change-Id: Ifc9bfec9738ee6e548ff4b8b06bc40fc33d552d4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 76ce7d81 a74545bf

core/jni/android_os_Parcel.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -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;

    }

    }