summaryrefslogtreecommitdiffstats
path: root/services/usb
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2015-04-10 08:25:55 -0700
committerMike Lockwood <lockwood@google.com>2015-04-10 08:49:53 -0700
commitdee5f1bb6e42875a1134d0e8efeef528b92cc548 (patch)
treeda12f1fbd7222a0beae6488c1d5ec7490505be91 /services/usb
parent9189f5f0252e1ef3e7d00978ef12e964565dd6f1 (diff)
downloadframeworks_base-dee5f1bb6e42875a1134d0e8efeef528b92cc548.zip
frameworks_base-dee5f1bb6e42875a1134d0e8efeef528b92cc548.tar.gz
frameworks_base-dee5f1bb6e42875a1134d0e8efeef528b92cc548.tar.bz2
Add user visible name for USB peripheral MIDI device
Change-Id: I075a54dc3890bc5cf3927cecba3750e1d342d290
Diffstat (limited to 'services/usb')
-rw-r--r--services/usb/java/com/android/server/usb/UsbAlsaManager.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbAlsaManager.java b/services/usb/java/com/android/server/usb/UsbAlsaManager.java
index 2728af1..8f0c6c8 100644
--- a/services/usb/java/com/android/server/usb/UsbAlsaManager.java
+++ b/services/usb/java/com/android/server/usb/UsbAlsaManager.java
@@ -469,10 +469,12 @@ public final class UsbAlsaManager {
if (enabled && mPeripheralMidiDevice == null) {
Bundle properties = new Bundle();
Resources r = mContext.getResources();
+ properties.putString(MidiDeviceInfo.PROPERTY_NAME, r.getString(
+ com.android.internal.R.string.usb_midi_peripheral_name));
properties.putString(MidiDeviceInfo.PROPERTY_MANUFACTURER, r.getString(
com.android.internal.R.string.usb_midi_peripheral_manufacturer_name));
properties.putString(MidiDeviceInfo.PROPERTY_PRODUCT, r.getString(
- com.android.internal.R.string.usb_midi_peripheral_model_name));
+ com.android.internal.R.string.usb_midi_peripheral_product_name));
properties.putInt(MidiDeviceInfo.PROPERTY_ALSA_CARD, card);
properties.putInt(MidiDeviceInfo.PROPERTY_ALSA_DEVICE, device);
mPeripheralMidiDevice = UsbMidiDevice.create(mContext, properties, card, device);