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

Commit f9e6e706 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Add comments"

parents 04e57d29 19d6c7a9

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

+5 −4
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ public final class UsbAlsaManager { 
        audioDevice.mDeviceName = cardRecord.mCardName;

        audioDevice.mDeviceDescription = cardRecord.mCardDescription;



        notifyDeviceState(audioDevice, true);

        notifyDeviceState(audioDevice, true /*enabled*/);



        return audioDevice;

    }
@@ -442,7 +442,7 @@ public final class UsbAlsaManager { 
        Slog.i(TAG, "USB Audio Device Removed: " + audioDevice);

        if (audioDevice != null) {

            if (audioDevice.mHasPlayback || audioDevice.mHasCapture) {

                notifyDeviceState(audioDevice, false);

                notifyDeviceState(audioDevice, false /*enabled*/);



                // if there any external devices left, select one of them

                selectDefaultDevice();
@@ -461,9 +461,9 @@ public final class UsbAlsaManager { 
        if (enabled) {

            mAccessoryAudioDevice = new UsbAudioDevice(card, device, true, false,

                    UsbAudioDevice.kAudioDeviceClass_External);

            notifyDeviceState(mAccessoryAudioDevice, true);

            notifyDeviceState(mAccessoryAudioDevice, true /*enabled*/);

        } else if (mAccessoryAudioDevice != null) {

            notifyDeviceState(mAccessoryAudioDevice, false);

            notifyDeviceState(mAccessoryAudioDevice, false /*enabled*/);

            mAccessoryAudioDevice = null;

        }

    }
@@ -508,6 +508,7 @@ public final class UsbAlsaManager { 
    //

    // Logging

    //

    // called by UsbService.dump

    public void dump(IndentingPrintWriter pw) {

        pw.println("USB Audio Devices:");

        for (UsbDevice device : mAudioDevices.keySet()) {

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

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ public final class UsbAudioDevice { 
        return sb.toString();

    }



    // called by logDevices

    public String toShortString() {

        return "[card:" + mCard + " device:" + mDevice + " " + mDeviceName + "]";

    }