Make metadata field mandatory for program info struct.
Test: VTS, manual
Change-Id: I3e4ed1f203dc28315d7c7db10c9ce3d83e4ec59d
diff --git a/services/radio/HidlUtils.cpp b/services/radio/HidlUtils.cpp
index bfced7a..3b33386 100644
--- a/services/radio/HidlUtils.cpp
+++ b/services/radio/HidlUtils.cpp
@@ -122,8 +122,7 @@
//static
void HidlUtils::convertProgramInfoFromHal(radio_program_info_t *info,
- const ProgramInfo *halInfo,
- bool withMetadata)
+ const ProgramInfo *halInfo)
{
info->channel = halInfo->channel;
info->sub_channel = halInfo->subChannel;
@@ -131,10 +130,8 @@
info->stereo = halInfo->stereo;
info->digital = halInfo->digital;
info->signal_strength = halInfo->signalStrength;
- if (withMetadata && halInfo->metadata.size() != 0) {
- convertMetaDataFromHal(&info->metadata, halInfo->metadata,
- halInfo->channel, halInfo->subChannel);
- }
+ convertMetaDataFromHal(&info->metadata, halInfo->metadata,
+ halInfo->channel, halInfo->subChannel);
}
//static