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

Commit e1d00395 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "MidiDeviceInfo: Add version string property" into mnc-dev

parents 9ac2718e 02868b16

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -17267,6 +17267,7 @@ package android.media.midi { 
    field public static final java.lang.String PROPERTY_PRODUCT = "product";

    field public static final java.lang.String PROPERTY_PRODUCT = "product";

    field public static final java.lang.String PROPERTY_SERIAL_NUMBER = "serial_number";

    field public static final java.lang.String PROPERTY_SERIAL_NUMBER = "serial_number";

    field public static final java.lang.String PROPERTY_USB_DEVICE = "usb_device";

    field public static final java.lang.String PROPERTY_USB_DEVICE = "usb_device";

    field public static final java.lang.String PROPERTY_VERSION = "version";

    field public static final int TYPE_BLUETOOTH = 3; // 0x3

    field public static final int TYPE_BLUETOOTH = 3; // 0x3

    field public static final int TYPE_USB = 1; // 0x1

    field public static final int TYPE_USB = 1; // 0x1

    field public static final int TYPE_VIRTUAL = 2; // 0x2

    field public static final int TYPE_VIRTUAL = 2; // 0x2

api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -18559,6 +18559,7 @@ package android.media.midi { 
    field public static final java.lang.String PROPERTY_PRODUCT = "product";

    field public static final java.lang.String PROPERTY_PRODUCT = "product";

    field public static final java.lang.String PROPERTY_SERIAL_NUMBER = "serial_number";

    field public static final java.lang.String PROPERTY_SERIAL_NUMBER = "serial_number";

    field public static final java.lang.String PROPERTY_USB_DEVICE = "usb_device";

    field public static final java.lang.String PROPERTY_USB_DEVICE = "usb_device";

    field public static final java.lang.String PROPERTY_VERSION = "version";

    field public static final int TYPE_BLUETOOTH = 3; // 0x3

    field public static final int TYPE_BLUETOOTH = 3; // 0x3

    field public static final int TYPE_USB = 1; // 0x1

    field public static final int TYPE_USB = 1; // 0x1

    field public static final int TYPE_VIRTUAL = 2; // 0x2

    field public static final int TYPE_VIRTUAL = 2; // 0x2

media/java/android/media/midi/MidiDeviceInfo.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -68,6 +68,13 @@ public final class MidiDeviceInfo implements Parcelable { 
     */

     */

    public static final String PROPERTY_PRODUCT = "product";

    public static final String PROPERTY_PRODUCT = "product";





    /**

     * Bundle key for the device's version property.

     * Used with the {@link android.os.Bundle} returned by {@link #getProperties}

     * Matches the USB device version number for USB MIDI devices.

     */

    public static final String PROPERTY_VERSION = "version";



    /**

    /**

     * Bundle key for the device's serial number property.

     * Bundle key for the device's serial number property.

     * Used with the {@link android.os.Bundle} returned by {@link #getProperties}

     * Used with the {@link android.os.Bundle} returned by {@link #getProperties}

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -401,6 +401,7 @@ public final class UsbAlsaManager { 
                    Bundle properties = new Bundle();

                    Bundle properties = new Bundle();

                    String manufacturer = usbDevice.getManufacturerName();

                    String manufacturer = usbDevice.getManufacturerName();

                    String product = usbDevice.getProductName();

                    String product = usbDevice.getProductName();

                    String version = usbDevice.getVersion();

                    String name;

                    String name;

                    if (manufacturer == null || manufacturer.isEmpty()) {

                    if (manufacturer == null || manufacturer.isEmpty()) {

                        name = product;

                        name = product;
@@ -412,6 +413,7 @@ public final class UsbAlsaManager { 
                    properties.putString(MidiDeviceInfo.PROPERTY_NAME, name);

                    properties.putString(MidiDeviceInfo.PROPERTY_NAME, name);

                    properties.putString(MidiDeviceInfo.PROPERTY_MANUFACTURER, manufacturer);

                    properties.putString(MidiDeviceInfo.PROPERTY_MANUFACTURER, manufacturer);

                    properties.putString(MidiDeviceInfo.PROPERTY_PRODUCT, product);

                    properties.putString(MidiDeviceInfo.PROPERTY_PRODUCT, product);

                    properties.putString(MidiDeviceInfo.PROPERTY_VERSION, version);

                    properties.putString(MidiDeviceInfo.PROPERTY_SERIAL_NUMBER,

                    properties.putString(MidiDeviceInfo.PROPERTY_SERIAL_NUMBER,

                            usbDevice.getSerialNumber());

                            usbDevice.getSerialNumber());

                    properties.putInt(MidiDeviceInfo.PROPERTY_ALSA_CARD, alsaDevice.mCard);

                    properties.putInt(MidiDeviceInfo.PROPERTY_ALSA_CARD, alsaDevice.mCard);