From b4db8206224e598839414b67b0a3adbc5dedd723 Mon Sep 17 00:00:00 2001 From: Jim Sun Date: Thu, 17 Mar 2022 10:23:39 +0800 Subject: [PATCH] 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 (cherry picked from https://android-review.googlesource.com/q/commit:d6b2ae28222e22599485bed960bf11fb261e2dad) Merged-In: Ieb626512bc18dbf4cc84bb104eb4fd9cba342b60 Change-Id: Ieb626512bc18dbf4cc84bb104eb4fd9cba342b60 --- services/usb/java/com/android/server/usb/UsbAlsaManager.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/usb/java/com/android/server/usb/UsbAlsaManager.java b/services/usb/java/com/android/server/usb/UsbAlsaManager.java index 99881e194b075..fd0d5401dae31 100644 --- a/services/usb/java/com/android/server/usb/UsbAlsaManager.java +++ b/services/usb/java/com/android/server/usb/UsbAlsaManager.java @@ -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) {