diff options
Diffstat (limited to 'broadcastradio/1.0/default/Utils.cpp')
| -rw-r--r-- | broadcastradio/1.0/default/Utils.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/broadcastradio/1.0/default/Utils.cpp b/broadcastradio/1.0/default/Utils.cpp index c2c2ff33a..aefeeb1f9 100644 --- a/broadcastradio/1.0/default/Utils.cpp +++ b/broadcastradio/1.0/default/Utils.cpp @@ -222,8 +222,7 @@ void Utils::convertBandConfigToHal( //static void Utils::convertProgramInfoFromHal(ProgramInfo *info, - radio_program_info_t *halInfo, - bool withMetadata) + radio_program_info_t *halInfo) { info->channel = halInfo->channel; info->subChannel = halInfo->sub_channel; @@ -231,9 +230,7 @@ void Utils::convertProgramInfoFromHal(ProgramInfo *info, info->stereo = halInfo->stereo; info->digital = halInfo->digital; info->signalStrength = halInfo->signal_strength; - if (withMetadata && halInfo->metadata != NULL) { - convertMetaDataFromHal(info->metadata, halInfo->metadata); - } + convertMetaDataFromHal(info->metadata, halInfo->metadata); } //static @@ -241,6 +238,7 @@ int Utils::convertMetaDataFromHal(hidl_vec<MetaData>& metadata, radio_metadata_t *halMetadata) { if (halMetadata == NULL) { + ALOGE("Invalid argument: halMetadata is NULL"); return 0; } |