Merge "Add PS5 controller PID to Alsa manager block list." into udc-dev

This commit is contained in:
Treehugger Robot
2023-05-09 16:20:47 +00:00
committed by Android (Google) Code Review

View File

@@ -89,6 +89,7 @@ public final class UsbAlsaManager {
private static final int USB_VENDORID_SONY = 0x054C; private static final int USB_VENDORID_SONY = 0x054C;
private static final int USB_PRODUCTID_PS4CONTROLLER_ZCT1 = 0x05C4; private static final int USB_PRODUCTID_PS4CONTROLLER_ZCT1 = 0x05C4;
private static final int USB_PRODUCTID_PS4CONTROLLER_ZCT2 = 0x09CC; private static final int USB_PRODUCTID_PS4CONTROLLER_ZCT2 = 0x09CC;
private static final int USB_PRODUCTID_PS5CONTROLLER = 0x0CE6;
private static final int USB_DENYLIST_OUTPUT = 0x0001; private static final int USB_DENYLIST_OUTPUT = 0x0001;
private static final int USB_DENYLIST_INPUT = 0x0002; private static final int USB_DENYLIST_INPUT = 0x0002;
@@ -111,6 +112,9 @@ public final class UsbAlsaManager {
USB_DENYLIST_OUTPUT), USB_DENYLIST_OUTPUT),
new DenyListEntry(USB_VENDORID_SONY, new DenyListEntry(USB_VENDORID_SONY,
USB_PRODUCTID_PS4CONTROLLER_ZCT2, USB_PRODUCTID_PS4CONTROLLER_ZCT2,
USB_DENYLIST_OUTPUT),
new DenyListEntry(USB_VENDORID_SONY,
USB_PRODUCTID_PS5CONTROLLER,
USB_DENYLIST_OUTPUT)); USB_DENYLIST_OUTPUT));
private static boolean isDeviceDenylisted(int vendorId, int productId, int flags) { private static boolean isDeviceDenylisted(int vendorId, int productId, int flags) {