Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tomasz Wasilczyk
2017-01-07 20:03:40 +00:00
committed by Android (Google) Code Review
parent 9a26e434ba 8c8863d7aa
commit dcfb346761
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/jni/android_hardware_Radio.cpp
View File

@@ -313,12 +313,14 @@ static jint convertProgramInfoFromNative(JNIEnv *env,
ALOGV("%s", __FUNCTION__);
int jStatus;
jobject jMetadata = NULL;
if (nProgramInfo->metadata != NULL) {
ALOGV("%s metadata %p", __FUNCTION__, nProgramInfo->metadata);
jStatus = convertMetadataFromNative(env, &jMetadata, nProgramInfo->metadata);
if (jStatus < 0) {
return jStatus;
}
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);