Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Implement a "blacklist" for ALSA devices." into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-09 20:10:33 +00:00
committed by Android (Google) Code Review
parent 31cf0ff5b7 bfae878d6f
commit 4a036fb389
1 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
services/usb/java/com/android/server/usb/UsbAlsaManager.java
View File

@@ -35,7 +35,9 @@ import com.android.server.usb.descriptors.UsbDescriptorParser;
import libcore.io.IoUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
/**
* UsbAlsaManager manages USB audio and MIDI devices.
@@ -61,6 +63,50 @@ public final class UsbAlsaManager {
private final ArrayList<UsbAlsaDevice> mAlsaDevices = new ArrayList<UsbAlsaDevice>();
private UsbAlsaDevice mSelectedDevice;
//
// Device Blacklist
//
// This exists due to problems with Sony game controllers which present as an audio device
// even if no headset is connected and have no way to set the volume on the unit.
// Handle this by simply declining to use them as an audio device.
private static final int USB_VENDORID_SONY = 0x054C;
private static final int USB_PRODUCTID_PS4CONTROLLER_ZCT1 = 0x05C4;
private static final int USB_PRODUCTID_PS4CONTROLLER_ZCT2 = 0x09CC;
private static final int USB_BLACKLIST_OUTPUT = 0x0001;
private static final int USB_BLACKLIST_INPUT = 0x0002;
private static class BlackListEntry {
final int mVendorId;
final int mProductId;
final int mFlags;
BlackListEntry(int vendorId, int productId, int flags) {
mVendorId = vendorId;
mProductId = productId;
mFlags = flags;
}
}
static final List<BlackListEntry> sDeviceBlacklist = Arrays.asList(
new BlackListEntry(USB_VENDORID_SONY,
USB_PRODUCTID_PS4CONTROLLER_ZCT1,
USB_BLACKLIST_OUTPUT),
new BlackListEntry(USB_VENDORID_SONY,
USB_PRODUCTID_PS4CONTROLLER_ZCT2,
USB_BLACKLIST_OUTPUT));
private static boolean isDeviceBlacklisted(int vendorId, int productId, int flags) {
for (BlackListEntry entry : sDeviceBlacklist) {
if (entry.mVendorId == vendorId && entry.mProductId == productId) {
// see if the type flag is set
return (entry.mFlags & flags) != 0;
}
}
return false;
}
/**
* List of connected MIDI devices
*/
@@ -179,8 +225,12 @@ public final class UsbAlsaManager {
}
// Add it to the devices list
boolean hasInput = parser.hasInput();
boolean hasOutput = parser.hasOutput();
boolean hasInput = parser.hasInput()
&& !isDeviceBlacklisted(usbDevice.getVendorId(), usbDevice.getProductId(),
USB_BLACKLIST_INPUT);
boolean hasOutput = parser.hasOutput()
&& !isDeviceBlacklisted(usbDevice.getVendorId(), usbDevice.getProductId(),
USB_BLACKLIST_OUTPUT);
if (DEBUG) {
Slog.d(TAG, "hasInput: " + hasInput + " hasOutput:" + hasOutput);
}