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

Commit 5ff6e9bb authored by Jiabin Huang's avatar Jiabin Huang Committed by Android (Google) Code Review
Browse files

Merge "UsbAlsaManager: name of USB Audio device on the Audio side is displayed... 

Merge "UsbAlsaManager: name of USB Audio device on the Audio side is displayed abnormally" into main
parents a6775236 bdc7de97

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

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ public final class UsbAlsaManager { 
                                      deviceAddress, hasOutput, hasInput,

                                      isInputHeadset, isOutputHeadset, isDock);

            alsaDevice.setDeviceNameAndDescription(

                    usbDevice.getProductName(), cardRec.getCardDescription());

                    cardRec.getCardName(), cardRec.getCardDescription());



            // Deselect the current active audio connection to allow the new

            // device to kick in, unless multiple connections is supported.