Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48df4aa1 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Add PS5 controller PID to Alsa manager block list." am:... 

Merge "Merge "Add PS5 controller PID to Alsa manager block list." am: 956e4f96 am: 3ef2a261 am: ac6cbefc am: ba3d9f72 am: c9cbd0da" into udc-qpr-dev-plus-aosp am: 24a6aaa9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036405



Change-Id: Ibaa1f4ba4f1651c82a908db17d72cde1423c3e3c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79115611 24a6aaa9

services/usb/java/com/android/server/usb/UsbAlsaManager.java

+4 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ public final class UsbAlsaManager { 
    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_PRODUCTID_PS5CONTROLLER = 0x0CE6;



    private static final int USB_DENYLIST_OUTPUT = 0x0001;

    private static final int USB_DENYLIST_INPUT  = 0x0002;
@@ -111,6 +112,9 @@ public final class UsbAlsaManager { 
                    USB_DENYLIST_OUTPUT),

            new DenyListEntry(USB_VENDORID_SONY,

                    USB_PRODUCTID_PS4CONTROLLER_ZCT2,

                    USB_DENYLIST_OUTPUT),

            new DenyListEntry(USB_VENDORID_SONY,

                    USB_PRODUCTID_PS5CONTROLLER,

                    USB_DENYLIST_OUTPUT));



    private static boolean isDeviceDenylisted(int vendorId, int productId, int flags) {