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

Commit 8c8863d7 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

Make metadata field mandatory for program info struct.

Test: VTS, manual
Change-Id: I2630e246eba3980ae6517d92cab3a9fc55d8d7b4
parent 92b504cb
Loading
Loading
Loading
Loading
+8 −6
Original line number Diff line number Diff line
@@ -313,13 +313,15 @@ static jint convertProgramInfoFromNative(JNIEnv *env,
    ALOGV("%s", __FUNCTION__);
    int jStatus;
    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);
    if (jStatus < 0) {
        return jStatus;
    }
    }

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