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

Commit ef3b608c authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android Git Automerger
Browse files

am 45ab734a: Merge "Add missing NULL check for android_os_Parcel_writeInt" into mnc-dev 

* commit '45ab734a':
  Add missing NULL check for android_os_Parcel_writeInt
parents e42c9ea0 45ab734a

core/jni/android_os_Parcel.cpp

+5 −3
Original line number Diff line number Diff line
@@ -230,11 +230,13 @@ static void android_os_Parcel_writeBlob(JNIEnv* env, jclass clazz, jlong nativeP 


static void android_os_Parcel_writeInt(JNIEnv* env, jclass clazz, jlong nativePtr, jint val) {

    Parcel* parcel = reinterpret_cast<Parcel*>(nativePtr);

    if (parcel != NULL) {

        const status_t err = parcel->writeInt32(val);

        if (err != NO_ERROR) {

            signalExceptionForError(env, clazz, err);

        }

    }

}



static void android_os_Parcel_writeLong(JNIEnv* env, jclass clazz, jlong nativePtr, jlong val)

{