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

Commit c481c5a1 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "Parcel marshall - disallow RPC Parcels" am: 609f7a65 am: 9d490661... 

Merge "Parcel marshall - disallow RPC Parcels" am: 609f7a65 am: 9d490661 am: 40140a81 am: 728f881f

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



Change-Id: I6176f9c2e824e4e20f6f7a77c212f007d416c209
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 94ec0555 728f881f

core/jni/android_os_Parcel.cpp

+5 −0
Original line number Diff line number Diff line
@@ -549,6 +549,11 @@ static jbyteArray android_os_Parcel_marshall(JNIEnv* env, jclass clazz, jlong na 
       return NULL;

    }



    if (parcel->isForRpc()) {

        jniThrowException(env, "java/lang/RuntimeException", "Tried to marshall an RPC Parcel.");

        return NULL;

    }



    if (parcel->objectsCount())

    {

        jniThrowException(env, "java/lang/RuntimeException",