diff options
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/media/InputMediaDevice.java | 4 | ||||
| -rw-r--r-- | packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InputMediaDeviceTest.java | 16 |
2 files changed, 19 insertions, 1 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/media/InputMediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/InputMediaDevice.java index 6335e712f904..83ee9751329f 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/InputMediaDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/InputMediaDevice.java @@ -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); }; } diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InputMediaDeviceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InputMediaDeviceTest.java index 6c1cb7015225..7775b912e51d 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InputMediaDeviceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InputMediaDeviceTest.java @@ -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(); @@ -142,6 +143,21 @@ public class InputMediaDeviceTest { 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, + String.valueOf(BT_HEADSET_ID), + AudioDeviceInfo.TYPE_BLUETOOTH_SCO, + MAX_VOLUME, + CURRENT_VOLUME, + IS_VOLUME_FIXED, null); assertThat(btMediaDevice).isNotNull(); assertThat(btMediaDevice.getName()) |