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

Remove DAB selector secondary ids check in service

Browse Source 
Secondary ids for DAB selector, ensemble and frequency are not
mandatory, so the check for this is removed for better flexibilty
in tuning operation.

Bug: 273804622
Test: atest com.android.server.broadcastradio
Test: atest android.hardware.radio
Change-Id: Ic3293c70bd80f6bcefb6cea7c60768a83c5617a4
This commit is contained in:
Weilin Xu
2023-03-15 23:51:39 +00:00
parent 6bbd3e99e3
commit 04510b8a2f
2 changed files with 7 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/aidl/ConversionUtilsTest.java
View File

@@ -258,20 +258,6 @@ public final class ConversionUtilsTest extends ExtendedRadioMockitoTestCase {
.containsExactly(TEST_HAL_DAB_FREQUENCY_ID, TEST_HAL_DAB_ENSEMBLE_ID);
}
@Test
public void programSelectorToHalProgramSelector_withInvalidDabSelector_returnsNull() {
ProgramSelector invalidDbSelector = new ProgramSelector(ProgramSelector.PROGRAM_TYPE_DAB,
TEST_DAB_SID_EXT_ID,
new ProgramSelector.Identifier[0],
new long[0]);
android.hardware.broadcastradio.ProgramSelector invalidHalDabSelector =
ConversionUtils.programSelectorToHalProgramSelector(invalidDbSelector);
expect.withMessage("Invalid HAL DAB selector without required secondary ids")
.that(invalidHalDabSelector).isNull();
}
@Test
public void programSelectorFromHalProgramSelector_withValidSelector() {
android.hardware.broadcastradio.ProgramSelector halDabSelector =
@@ -288,18 +274,6 @@ public final class ConversionUtilsTest extends ExtendedRadioMockitoTestCase {
.containsExactly(TEST_DAB_FREQUENCY_ID, TEST_DAB_ENSEMBLE_ID);
}
@Test
public void programSelectorFromHalProgramSelector_withInvalidSelector_returnsNull() {
android.hardware.broadcastradio.ProgramSelector invalidHalDabSelector =
AidlTestUtils.makeHalSelector(TEST_HAL_DAB_SID_EXT_ID, new ProgramIdentifier[]{});
ProgramSelector invalidDabSelector =
ConversionUtils.programSelectorFromHalProgramSelector(invalidHalDabSelector);
expect.withMessage("Invalid DAB selector without required secondary ids")
.that(invalidDabSelector).isNull();
}
@Test
public void programInfoFromHalProgramInfo_withValidProgramInfo() {
android.hardware.broadcastradio.ProgramSelector halDabSelector =

32
services/core/java/com/android/server/broadcastradio/aidl/ConversionUtils.java
View File

@@ -347,31 +347,13 @@ final class ConversionUtils {
private static boolean isValidHalProgramSelector(
android.hardware.broadcastradio.ProgramSelector sel) {
if (sel.primaryId.type != IdentifierType.AMFM_FREQUENCY_KHZ
&& sel.primaryId.type != IdentifierType.RDS_PI
&& sel.primaryId.type != IdentifierType.HD_STATION_ID_EXT
&& sel.primaryId.type != IdentifierType.DAB_SID_EXT
&& sel.primaryId.type != IdentifierType.DRMO_SERVICE_ID
&& sel.primaryId.type != IdentifierType.SXM_SERVICE_ID
&& !isVendorIdentifierType(sel.primaryId.type)) {
return false;
}
if (sel.primaryId.type == IdentifierType.DAB_SID_EXT) {
boolean hasEnsemble = false;
boolean hasFrequency = false;
for (int i = 0; i < sel.secondaryIds.length; i++) {
if (sel.secondaryIds[i].type == IdentifierType.DAB_ENSEMBLE) {
hasEnsemble = true;
} else if (sel.secondaryIds[i].type == IdentifierType.DAB_FREQUENCY_KHZ) {
hasFrequency = true;
}
if (hasEnsemble && hasFrequency) {
return true;
}
}
return false;
}
return true;
return sel.primaryId.type == IdentifierType.AMFM_FREQUENCY_KHZ
|| sel.primaryId.type == IdentifierType.RDS_PI
|| sel.primaryId.type == IdentifierType.HD_STATION_ID_EXT
|| sel.primaryId.type == IdentifierType.DAB_SID_EXT
|| sel.primaryId.type == IdentifierType.DRMO_SERVICE_ID
|| sel.primaryId.type == IdentifierType.SXM_SERVICE_ID
|| isVendorIdentifierType(sel.primaryId.type);
}
@Nullable