Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'bcec6a4980366f10182c8dc09ec1eff6f78d7043':
  MidiDeviceInfo: Add version string property
This commit is contained in:
Mike Lockwood
2015-04-29 21:15:25 +00:00
committed by Android Git Automerger
parent 8756f9b34d bcec6a4980
commit 62b4cbceb3
4 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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

1
api/system-current.txt
View File

@@ -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

7
media/java/android/media/midi/MidiDeviceInfo.java
View File

@@ -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}

2
services/usb/java/com/android/server/usb/UsbAlsaManager.java
View File

@@ -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);