diff options
| author | BeYkeRYkt <beykerykt@gmail.com> | 2019-10-14 20:44:07 +0900 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2019-10-14 21:17:07 +0200 |
| commit | fb330c9b363171132587df04005635d07a0426b9 (patch) | |
| tree | 9b29838d8ad063fd7473bdce4d13a6bdccb194d2 | |
| parent | a6a9ea2abc91b385abfe180727fae4ea79619a23 (diff) | |
AudioFX: Add support for usb headset devices
* Starting with Android O, a new USB device has been added - TYPE_USB_HEADSET.
Assign its prefix as USB, as some usb headsets weren't being recognized
properly.
Change-Id: I92aef3e0e7118717f5f5df8a951f64c5a5fa3eff
| -rw-r--r-- | src/org/lineageos/audiofx/activity/MasterConfigControl.java | 3 | ||||
| -rw-r--r-- | src/org/lineageos/audiofx/fragment/AudioFxFragment.java | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/org/lineageos/audiofx/activity/MasterConfigControl.java b/src/org/lineageos/audiofx/activity/MasterConfigControl.java index c620070..90ce1a1 100644 --- a/src/org/lineageos/audiofx/activity/MasterConfigControl.java +++ b/src/org/lineageos/audiofx/activity/MasterConfigControl.java @@ -23,6 +23,7 @@ import static android.media.AudioDeviceInfo.TYPE_LINE_ANALOG; import static android.media.AudioDeviceInfo.TYPE_LINE_DIGITAL; import static android.media.AudioDeviceInfo.TYPE_USB_ACCESSORY; import static android.media.AudioDeviceInfo.TYPE_USB_DEVICE; +import static android.media.AudioDeviceInfo.TYPE_USB_HEADSET; import static android.media.AudioDeviceInfo.TYPE_WIRED_HEADPHONES; import static android.media.AudioDeviceInfo.TYPE_WIRED_HEADSET; import static android.media.AudioDeviceInfo.convertDeviceTypeToInternalDevice; @@ -339,6 +340,7 @@ public class MasterConfigControl { case TYPE_BLUETOOTH_A2DP: case TYPE_USB_DEVICE: case TYPE_USB_ACCESSORY: + case TYPE_USB_HEADSET: case TYPE_DOCK: case TYPE_IP: return info.getProductName().toString(); @@ -377,6 +379,7 @@ public class MasterConfigControl { return appendDeviceAddress(info, Constants.DEVICE_PREFIX_BLUETOOTH); case TYPE_USB_DEVICE: case TYPE_USB_ACCESSORY: + case TYPE_USB_HEADSET: case TYPE_DOCK: return appendProductName(info, Constants.DEVICE_PREFIX_USB); case TYPE_IP: diff --git a/src/org/lineageos/audiofx/fragment/AudioFxFragment.java b/src/org/lineageos/audiofx/fragment/AudioFxFragment.java index a2d5b26..12b3e4c 100644 --- a/src/org/lineageos/audiofx/fragment/AudioFxFragment.java +++ b/src/org/lineageos/audiofx/fragment/AudioFxFragment.java @@ -315,7 +315,8 @@ public class AudioFxFragment extends Fragment implements StateCallbacks.DeviceCh } List<AudioDeviceInfo> usbDevices = mConfig.getConnectedDevices( - AudioDeviceInfo.TYPE_USB_ACCESSORY, AudioDeviceInfo.TYPE_USB_DEVICE); + AudioDeviceInfo.TYPE_USB_ACCESSORY, AudioDeviceInfo.TYPE_USB_DEVICE, + AudioDeviceInfo.TYPE_USB_HEADSET); for (AudioDeviceInfo ai : usbDevices) { int viewId = View.generateViewId(); MenuItem item = mMenuDevices.getSubMenu().add(R.id.devices, viewId, |