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

Commit d6b2ae28 authored by Jim Sun's avatar Jim Sun Committed by Houxiang Dai
Browse files

Add PS5 controller PID to Alsa manager block list. 

Disable PS5 controller audio output.

Test:
Playing a game on Staida APP and then insert PS5 controller, TV dosen't mute.

Bug: 225293215
Change-Id: Ieb626512bc18dbf4cc84bb104eb4fd9cba342b60
parent 6c21b2bf

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -72,6 +72,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;
@@ -94,6 +95,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) {