Merge "audio: Display product name for bt input devices" into main (d66ed506) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/media/InputMediaDevice.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -125,7 +125,9 @@ public class InputMediaDevice extends MediaDevice {
		? mProductName
		: mContext.getString(R.string.media_transfer_usb_device_mic_name);
		case TYPE_BLUETOOTH_SCO ->
		mContext.getString(R.string.media_transfer_bt_device_mic_name);
		mProductName != null
		? mProductName
		: mContext.getString(R.string.media_transfer_bt_device_mic_name);
		default -> mContext.getString(R.string.media_transfer_this_device_name_desktop);
		};
		}

+16 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ public class InputMediaDeviceTest {
		private static final String PRODUCT_NAME_BUILTIN_MIC = "Built-in Mic";
		private static final String PRODUCT_NAME_WIRED_HEADSET = "My Wired Headset";
		private static final String PRODUCT_NAME_USB_HEADSET = "My USB Headset";
		private static final String PRODUCT_NAME_BT_HEADSET = "My Bluetooth Headset";

		@Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();

		@@ -134,6 +135,21 @@ public class InputMediaDeviceTest {

		@Test
		public void getName_returnCorrectName_btHeadset() {
		InputMediaDevice btMediaDevice =
		InputMediaDevice.create(
		mContext,
		String.valueOf(BT_HEADSET_ID),
		AudioDeviceInfo.TYPE_BLUETOOTH_SCO,
		MAX_VOLUME,
		CURRENT_VOLUME,
		IS_VOLUME_FIXED,
		PRODUCT_NAME_BT_HEADSET);
		assertThat(btMediaDevice).isNotNull();
		assertThat(btMediaDevice.getName()).isEqualTo(PRODUCT_NAME_BT_HEADSET);
		}

		@Test
		public void getName_returnCorrectName_btHeadset_nullProductName() {
		InputMediaDevice btMediaDevice =
		InputMediaDevice.create(
		mContext,