Merge "Fix BandConfig constructor inconsistency" (2f3f7856) · Commits · e / os / android_frameworks_base

core/java/android/hardware/radio/RadioManager.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -921,7 +921,10 @@ public class RadioManager {
		@NonNull final BandDescriptor mDescriptor;

		BandConfig(BandDescriptor descriptor) {
		mDescriptor = Objects.requireNonNull(descriptor);
		Objects.requireNonNull(descriptor, "Descriptor cannot be null");
		mDescriptor = new BandDescriptor(descriptor.getRegion(), descriptor.getType(),
		descriptor.getLowerLimit(), descriptor.getUpperLimit(),
		descriptor.getSpacing());
		}

		BandConfig(int region, int type, int lowerLimit, int upperLimit, int spacing) {

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

+34 −2

Original line number	Diff line number	Diff line
		@@ -186,6 +186,20 @@ public final class RadioManagerTest {
		.that(bandDescriptor.describeContents()).isEqualTo(0);
		}

		@Test
		public void writeToParcel_forBandDescriptor() {
		Parcel parcel = Parcel.obtain();
		RadioManager.BandDescriptor bandDescriptor = createFmBandDescriptor();

		bandDescriptor.writeToParcel(parcel, /* flags= */ 0);
		parcel.setDataPosition(0);

		RadioManager.BandDescriptor bandDescriptorFromParcel =
		RadioManager.BandDescriptor.CREATOR.createFromParcel(parcel);
		assertWithMessage("Band Descriptor created from parcel")
		.that(bandDescriptorFromParcel).isEqualTo(bandDescriptor);
		}

		@Test
		public void newArray_forBandDescriptorCreator() {
		RadioManager.BandDescriptor[] bandDescriptors =
		@@ -420,6 +434,20 @@ public final class RadioManagerTest {
		.that(bandConfig.describeContents()).isEqualTo(0);
		}

		@Test
		public void writeToParcel_forBandConfig() {
		Parcel parcel = Parcel.obtain();
		RadioManager.BandConfig bandConfig = createAmBandConfig();

		bandConfig.writeToParcel(parcel, /* flags= */ 0);
		parcel.setDataPosition(0);

		RadioManager.BandConfig bandConfigFromParcel =
		RadioManager.BandConfig.CREATOR.createFromParcel(parcel);
		assertWithMessage("Band Config created from parcel")
		.that(bandConfigFromParcel).isEqualTo(bandConfig);
		}

		@Test
		public void newArray_forBandConfigCreator() {
		RadioManager.BandConfig[] bandConfigs =
		@@ -520,7 +548,9 @@ public final class RadioManagerTest {

		@Test
		public void equals_withSameFmBandConfigs_returnsTrue() {
		RadioManager.FmBandConfig fmBandConfigCompared = createFmBandConfig();
		RadioManager.FmBandConfig.Builder builder =
		new RadioManager.FmBandConfig.Builder(FM_BAND_CONFIG);
		RadioManager.FmBandConfig fmBandConfigCompared = builder.build();

		assertWithMessage("The same FM Band Config")
		.that(FM_BAND_CONFIG).isEqualTo(fmBandConfigCompared);
		@@ -545,7 +575,9 @@ public final class RadioManagerTest {

		@Test
		public void equals_withSameAmBandConfigs_returnsTrue() {
		RadioManager.AmBandConfig amBandConfigCompared = createAmBandConfig();
		RadioManager.AmBandConfig.Builder builder =
		new RadioManager.AmBandConfig.Builder(AM_BAND_CONFIG);
		RadioManager.AmBandConfig amBandConfigCompared = builder.build();

		assertWithMessage("The same AM Band Config")
		.that(AM_BAND_CONFIG).isEqualTo(amBandConfigCompared);