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

Commit 1621863b authored by Bernardo Rufino's avatar Bernardo Rufino Committed by Automerger Merge Worker
Browse files

Merge "Change out value type for Parcel::hasFileDescriptorsInRange()" am:... 

Merge "Change out value type for Parcel::hasFileDescriptorsInRange()" am: 6a793fe2 am: 21f38c92 am: ec6c274a am: d092f3d9 am: d659d92f

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

Change-Id: I6da2af48b0a103d156b52e4e4d33204a9ed726e4
parents ed1244b2 d659d92f

core/jni/android_os_Parcel.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -641,7 +641,7 @@ static jboolean android_os_Parcel_hasFileDescriptorsInRange(JNIEnv* env, jclass 
    Parcel* parcel = reinterpret_cast<Parcel*>(nativePtr);

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

    if (parcel != NULL) {

    if (parcel != NULL) {

        bool result;

        bool result;

        status_t err = parcel->hasFileDescriptorsInRange(offset, length, result);

        status_t err = parcel->hasFileDescriptorsInRange(offset, length, &result);

        if (err != NO_ERROR) {

        if (err != NO_ERROR) {

            signalExceptionForError(env, clazz, err);

            signalExceptionForError(env, clazz, err);

            return JNI_FALSE;

            return JNI_FALSE;