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

Commit dcfb3467 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Android (Google) Code Review
Browse files

Merge "Make metadata field mandatory for program info struct."

parents 9a26e434 8c8863d7

core/jni/android_hardware_Radio.cpp

+8 −6
Original line number Original line Diff line number Diff line
@@ -313,13 +313,15 @@ static jint convertProgramInfoFromNative(JNIEnv *env, 
    ALOGV("%s", __FUNCTION__);

    ALOGV("%s", __FUNCTION__);

    int jStatus;

    int jStatus;

    jobject jMetadata = NULL;

    jobject jMetadata = NULL;

    if (nProgramInfo->metadata != NULL) {



        ALOGV("%s metadata %p", __FUNCTION__, nProgramInfo->metadata);

    if (nProgramInfo == nullptr || nProgramInfo->metadata == nullptr) {

        return (jint)RADIO_STATUS_BAD_VALUE;

    }



    jStatus = convertMetadataFromNative(env, &jMetadata, nProgramInfo->metadata);

    jStatus = convertMetadataFromNative(env, &jMetadata, nProgramInfo->metadata);

    if (jStatus < 0) {

    if (jStatus < 0) {

        return jStatus;

        return jStatus;

    }

    }

    }





    ALOGV("%s channel %d tuned %d", __FUNCTION__, nProgramInfo->channel, nProgramInfo->tuned);

    ALOGV("%s channel %d tuned %d", __FUNCTION__, nProgramInfo->channel, nProgramInfo->tuned);