Merge "Remove usages of hd_radio_improved flag" into main (38ea9eaf) · Commits · e / os / android_frameworks_base

core/java/android/hardware/radio/RadioMetadata.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -369,8 +369,7 @@ public final class RadioMetadata implements Parcelable {
		return false;
		}
		for (String key : mBundle.keySet()) {
		if (Flags.hdRadioImproved() && Objects.equals(METADATA_KEYS_TYPE.get(key),
		METADATA_TYPE_TEXT_ARRAY)) {
		if (Objects.equals(METADATA_KEYS_TYPE.get(key), METADATA_TYPE_TEXT_ARRAY)) {
		if (!Arrays.equals(mBundle.getStringArray(key), otherBundle.getStringArray(key))) {
		return false;
		}
		@@ -410,8 +409,7 @@ public final class RadioMetadata implements Parcelable {

		sb.append(keyDisp);
		sb.append('=');
		if (Flags.hdRadioImproved() && Objects.equals(METADATA_KEYS_TYPE.get(key),
		METADATA_TYPE_TEXT_ARRAY)) {
		if (Objects.equals(METADATA_KEYS_TYPE.get(key), METADATA_TYPE_TEXT_ARRAY)) {
		String[] stringArrayValue = mBundle.getStringArray(key);
		sb.append('[');
		for (int i = 0; i < stringArrayValue.length; i++) {

core/java/android/hardware/radio/TunerAdapter.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -423,7 +423,7 @@ final class TunerAdapter extends RadioTuner {

		private @RadioManager.ConfigFlag int convertForceAnalogConfigFlag(
		@RadioManager.ConfigFlag int flag) throws RemoteException {
		if (Flags.hdRadioImproved() && flag == RadioManager.CONFIG_FORCE_ANALOG
		if (flag == RadioManager.CONFIG_FORCE_ANALOG
		&& mTuner.isConfigFlagSupported(RadioManager.CONFIG_FORCE_ANALOG_FM)) {
		flag = RadioManager.CONFIG_FORCE_ANALOG_FM;
		}

core/tests/BroadcastRadioTests/src/android/hardware/radio/RadioManagerTest.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -1127,24 +1127,18 @@ public final class RadioManagerTest {

		@Test
		public void isSignalAcquired_forProgramInfo() {
		mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

		mExpect.withMessage("Signal acquisition status for HD program info")
		.that(HD_PROGRAM_INFO.isSignalAcquired()).isTrue();
		}

		@Test
		public void isHdSisAvailable_forProgramInfo() {
		mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

		mExpect.withMessage("SIS information acquisition status for HD program")
		.that(HD_PROGRAM_INFO.isHdSisAvailable()).isTrue();
		}

		@Test
		public void isHdAudioAvailable_forProgramInfo() {
		mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

		mExpect.withMessage("Audio acquisition status for HD program")
		.that(HD_PROGRAM_INFO.isHdAudioAvailable()).isFalse();
		}

core/tests/BroadcastRadioTests/src/android/hardware/radio/RadioMetadataTest.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -152,7 +152,6 @@ public final class RadioMetadataTest extends ExtendedRadioMockitoTestCase {

		@Test
		public void putStringArray_withIllegalKey_throwsException() {
		mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);
		String invalidStringArrayKey = RadioMetadata.METADATA_KEY_HD_STATION_NAME_LONG;

		IllegalArgumentException thrown = assertThrows(IllegalArgumentException.class, () -> {
		@@ -166,8 +165,6 @@ public final class RadioMetadataTest extends ExtendedRadioMockitoTestCase {

		@Test
		public void putStringArray_withNullKey_throwsException() {
		mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

		NullPointerException thrown = assertThrows(NullPointerException.class, () -> {
		mBuilder.putStringArray(/* key= */ null, UFIDS_VALUE);
		});
		@@ -178,8 +175,6 @@ public final class RadioMetadataTest extends ExtendedRadioMockitoTestCase {

		@Test
		public void putStringArray_withNullString_throwsException() {
		mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

		NullPointerException thrown = assertThrows(NullPointerException.class, () -> {
		mBuilder.putStringArray(RadioMetadata.METADATA_KEY_UFIDS, /* value= */ null);
		});
		@@ -353,7 +348,6 @@ public final class RadioMetadataTest extends ExtendedRadioMockitoTestCase {

		@Test
		public void getStringArray_withKeyInMetadata() {
		mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);
		String key = RadioMetadata.METADATA_KEY_UFIDS;
		RadioMetadata metadata = mBuilder.putStringArray(key, UFIDS_VALUE).build();

		@@ -363,7 +357,6 @@ public final class RadioMetadataTest extends ExtendedRadioMockitoTestCase {

		@Test
		public void getStringArray_withKeyNotInMetadata() {
		mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);
		String key = RadioMetadata.METADATA_KEY_UFIDS;
		RadioMetadata metadata = mBuilder.build();

		@@ -377,7 +370,6 @@ public final class RadioMetadataTest extends ExtendedRadioMockitoTestCase {

		@Test
		public void getStringArray_withNullKey() {
		mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);
		RadioMetadata metadata = mBuilder.build();

		NullPointerException thrown = assertThrows(NullPointerException.class, () -> {
		@@ -390,7 +382,6 @@ public final class RadioMetadataTest extends ExtendedRadioMockitoTestCase {

		@Test
		public void getStringArray_withInvalidKey() {
		mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);
		String invalidClockKey = RadioMetadata.METADATA_KEY_HD_STATION_NAME_LONG;
		RadioMetadata metadata = mBuilder.build();

		@@ -471,7 +462,6 @@ public final class RadioMetadataTest extends ExtendedRadioMockitoTestCase {

		@Test
		public void equals_forMetadataWithDifferentContents_returnsFalse() {
		mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);
		RadioMetadata metadata1 = mBuilder
		.putStringArray(RadioMetadata.METADATA_KEY_UFIDS, UFIDS_VALUE)
		.build();
		@@ -516,7 +506,6 @@ public final class RadioMetadataTest extends ExtendedRadioMockitoTestCase {

		@Test
		public void writeToParcel_forRadioMetadata_withStringArrayTypeMetadata() {
		mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);
		RadioMetadata metadataExpected = mBuilder
		.putInt(RadioMetadata.METADATA_KEY_RDS_PI, INT_KEY_VALUE)
		.putString(RadioMetadata.METADATA_KEY_ARTIST, ARTIST_KEY_VALUE)
		@@ -570,7 +559,6 @@ public final class RadioMetadataTest extends ExtendedRadioMockitoTestCase {

		@Test
		public void toString_containsMetadataValues() {
		mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);
		RadioMetadata metadataExpected = mBuilder
		.putInt(RadioMetadata.METADATA_KEY_RDS_PI, INT_KEY_VALUE)
		.putString(RadioMetadata.METADATA_KEY_ARTIST, ARTIST_KEY_VALUE)

core/tests/BroadcastRadioTests/src/android/hardware/radio/TunerAdapterTest.java

+2 −28

Original line number	Diff line number	Diff line
		@@ -648,38 +648,25 @@ public final class TunerAdapterTest {
		@Test
		public void isConfigFlagSet_withForceAnalogWhenFmForceAnalogSupported()
		throws Exception {
		mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);
		when(mTunerMock.isConfigFlagSupported(anyInt())).thenReturn(true);
		when(mTunerMock.isConfigFlagSet(RadioManager.CONFIG_FORCE_ANALOG_FM))
		.thenReturn(true);
		when(mTunerMock.isConfigFlagSet(RadioManager.CONFIG_FORCE_ANALOG)).thenReturn(false);

		assertWithMessage("Force analog with feature flag enabled and force FM supported")
		assertWithMessage("Force analog with feature force FM supported")
		.that(mRadioTuner.isConfigFlagSet(RadioManager.CONFIG_FORCE_ANALOG)).isTrue();
		}

		@Test
		public void isConfigFlagSet_withForceAnalogWhenFmForceAnalogNotSupported()
		throws Exception {
		mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);
		when(mTunerMock.isConfigFlagSupported(RadioManager.CONFIG_FORCE_ANALOG_FM))
		.thenReturn(false);
		when(mTunerMock.isConfigFlagSupported(RadioManager.CONFIG_FORCE_ANALOG)).thenReturn(true);
		when(mTunerMock.isConfigFlagSet(RadioManager.CONFIG_FORCE_ANALOG_FM)).thenReturn(true);
		when(mTunerMock.isConfigFlagSet(RadioManager.CONFIG_FORCE_ANALOG)).thenReturn(false);

		assertWithMessage("Force analog with feature flag enabled but force FM unsupported")
		.that(mRadioTuner.isConfigFlagSet(RadioManager.CONFIG_FORCE_ANALOG)).isFalse();
		}

		@Test
		public void isConfigFlagSet_withForceAnalogWhenHdRadioImprovedFeatureNotEnabled()
		throws Exception {
		mSetFlagsRule.disableFlags(Flags.FLAG_HD_RADIO_IMPROVED);
		when(mTunerMock.isConfigFlagSupported(anyInt())).thenReturn(true);
		when(mTunerMock.isConfigFlagSet(RadioManager.CONFIG_FORCE_ANALOG)).thenReturn(false);

		assertWithMessage("Force analog without Force FM enabled")
		assertWithMessage("Force analog with force FM unsupported")
		.that(mRadioTuner.isConfigFlagSet(RadioManager.CONFIG_FORCE_ANALOG)).isFalse();
		}

		@@ -717,7 +704,6 @@ public final class TunerAdapterTest {

		@Test
		public void setConfigFlag_withForceAnalogWhenFmForceAnalogSupported() throws Exception {
		mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);
		when(mTunerMock.isConfigFlagSupported(anyInt())).thenReturn(true);

		mRadioTuner.setConfigFlag(RadioManager.CONFIG_FORCE_ANALOG, /* value= */ false);
		@@ -729,7 +715,6 @@ public final class TunerAdapterTest {

		@Test
		public void setConfigFlag_withForceAnalogWhenFmForceAnalogNotSupported() throws Exception {
		mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);
		when(mTunerMock.isConfigFlagSupported(anyInt())).thenReturn(true);
		when(mTunerMock.isConfigFlagSupported(RadioManager.CONFIG_FORCE_ANALOG_FM))
		.thenReturn(false);
		@@ -741,17 +726,6 @@ public final class TunerAdapterTest {
		anyBoolean());
		}

		@Test
		public void setConfigFlag_withForceAnalogWhenHdRadioImprovedFeatureNotEnabled()
		throws Exception {
		mSetFlagsRule.disableFlags(Flags.FLAG_HD_RADIO_IMPROVED);
		when(mTunerMock.isConfigFlagSupported(anyInt())).thenReturn(true);

		mRadioTuner.setConfigFlag(RadioManager.CONFIG_FORCE_ANALOG, /* value= */ false);

		verify(mTunerMock).setConfigFlag(RadioManager.CONFIG_FORCE_ANALOG, false);
		}

		@Test
		public void getParameters_forTunerAdapter() throws Exception {
		List<String> parameterKeys = List.of("ParameterKeyMock");