Merge "Fix converting 28-bit DAB radio id to AIDL HAL id" into main (9da9f91d) · Commits · e / os / android_frameworks_base

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

+14 −3

Original line number	Diff line number	Diff line
		@@ -89,9 +89,6 @@ public final class ConversionUtilsTest extends ExtendedRadioMockitoTestCase {
		private static final ProgramSelector.Identifier TEST_DAB_FREQUENCY_ID =
		new ProgramSelector.Identifier(
		ProgramSelector.IDENTIFIER_TYPE_DAB_FREQUENCY, TEST_DAB_FREQUENCY_VALUE);
		private static final ProgramSelector.Identifier TEST_FM_FREQUENCY_ID =
		new ProgramSelector.Identifier(
		ProgramSelector.IDENTIFIER_TYPE_AMFM_FREQUENCY, TEST_FM_FREQUENCY_VALUE);
		private static final ProgramSelector.Identifier TEST_VENDOR_ID =
		new ProgramSelector.Identifier(
		ProgramSelector.IDENTIFIER_TYPE_VENDOR_START, TEST_VENDOR_ID_VALUE);
		@@ -250,6 +247,20 @@ public final class ConversionUtilsTest extends ExtendedRadioMockitoTestCase {
		.isEqualTo(TEST_HAL_DAB_SID_EXT_ID);
		}

		@Test
		public void identifierToHalProgramIdentifier_withDeprecateDabId() {
		long value = 0x98765ABCDL;
		ProgramSelector.Identifier dabId = new ProgramSelector.Identifier(
		ProgramSelector.IDENTIFIER_TYPE_DAB_SID_EXT, value);
		ProgramIdentifier halDabIdExpected = AidlTestUtils.makeHalIdentifier(
		IdentifierType.DAB_SID_EXT, 0x987650000ABCDL);

		ProgramIdentifier halDabId = ConversionUtils.identifierToHalProgramIdentifier(dabId);

		expect.withMessage("Converted 28-bit DAB identifier for HAL").that(halDabId)
		.isEqualTo(halDabIdExpected);
		}

		@Test
		public void identifierFromHalProgramIdentifier_withDabId() {
		ProgramSelector.Identifier dabId =

+10 −2

Original line number	Diff line number	Diff line
		@@ -323,10 +323,15 @@ final class ConversionUtils {
		static ProgramIdentifier identifierToHalProgramIdentifier(ProgramSelector.Identifier id) {
		ProgramIdentifier hwId = new ProgramIdentifier();
		hwId.type = id.getType();
		if (hwId.type == ProgramSelector.IDENTIFIER_TYPE_DAB_DMB_SID_EXT) {
		if (id.getType() == ProgramSelector.IDENTIFIER_TYPE_DAB_DMB_SID_EXT) {
		hwId.type = IdentifierType.DAB_SID_EXT;
		}
		hwId.value = id.getValue();
		long value = id.getValue();
		if (id.getType() == ProgramSelector.IDENTIFIER_TYPE_DAB_SID_EXT) {
		hwId.value = (value & 0xFFFF) \| ((value >>> 16) << 32);
		} else {
		hwId.value = value;
		}
		return hwId;
		}

		@@ -584,6 +589,9 @@ final class ConversionUtils {
		\|\| isNewIdentifierInU(info.getPhysicallyTunedTo())) {
		return false;
		}
		if (info.getRelatedContent() == null) {
		return true;
		}
		Iterator<ProgramSelector.Identifier> relatedContentIt = info.getRelatedContent().iterator();
		while (relatedContentIt.hasNext()) {
		if (isNewIdentifierInU(relatedContentIt.next())) {