diff options
| author | Mike Lockwood <lockwood@google.com> | 2015-03-13 17:27:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-13 17:27:37 +0000 |
| commit | 4011e209215d19a1633ed5d1643f3b7643001667 (patch) | |
| tree | 40d870c628a34df729e8becb0feedf10b1acfc30 /services/usb/java | |
| parent | 676fa348d04e3f2e6f315a913eb45c79ec6bb03c (diff) | |
| parent | f2cd8024028f602a5e4c27f3d9222e872e4e84f2 (diff) | |
| download | frameworks_base-4011e209215d19a1633ed5d1643f3b7643001667.zip frameworks_base-4011e209215d19a1633ed5d1643f3b7643001667.tar.gz frameworks_base-4011e209215d19a1633ed5d1643f3b7643001667.tar.bz2 | |
Merge "MidiDeviceInfo meta-data improvements:"
Diffstat (limited to 'services/usb/java')
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbAlsaManager.java | 18 | ||||
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbMidiDevice.java | 2 |
2 files changed, 15 insertions, 5 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbAlsaManager.java b/services/usb/java/com/android/server/usb/UsbAlsaManager.java index 78fbe16..23e1970 100644 --- a/services/usb/java/com/android/server/usb/UsbAlsaManager.java +++ b/services/usb/java/com/android/server/usb/UsbAlsaManager.java @@ -394,9 +394,19 @@ public final class UsbAlsaManager { AlsaDevice alsaDevice = waitForAlsaDevice(addedCard, device, AlsaDevice.TYPE_MIDI); if (alsaDevice != null) { Bundle properties = new Bundle(); - properties.putString(MidiDeviceInfo.PROPERTY_MANUFACTURER, - usbDevice.getManufacturerName()); - properties.putString(MidiDeviceInfo.PROPERTY_MODEL, usbDevice.getProductName()); + String manufacturer = usbDevice.getManufacturerName(); + String product = usbDevice.getProductName(); + String name; + if (manufacturer == null || manufacturer.isEmpty()) { + name = product; + } else if (product == null || product.isEmpty()) { + name = manufacturer; + } else { + name = manufacturer + " " + product; + } + properties.putString(MidiDeviceInfo.PROPERTY_NAME, name); + properties.putString(MidiDeviceInfo.PROPERTY_MANUFACTURER, manufacturer); + properties.putString(MidiDeviceInfo.PROPERTY_PRODUCT, product); properties.putString(MidiDeviceInfo.PROPERTY_SERIAL_NUMBER, usbDevice.getSerialNumber()); properties.putInt(MidiDeviceInfo.PROPERTY_ALSA_CARD, alsaDevice.mCard); @@ -454,7 +464,7 @@ public final class UsbAlsaManager { Resources r = mContext.getResources(); properties.putString(MidiDeviceInfo.PROPERTY_MANUFACTURER, r.getString( com.android.internal.R.string.usb_midi_peripheral_manufacturer_name)); - properties.putString(MidiDeviceInfo.PROPERTY_MODEL, r.getString( + properties.putString(MidiDeviceInfo.PROPERTY_PRODUCT, r.getString( com.android.internal.R.string.usb_midi_peripheral_model_name)); properties.putInt(MidiDeviceInfo.PROPERTY_ALSA_CARD, card); properties.putInt(MidiDeviceInfo.PROPERTY_ALSA_DEVICE, device); diff --git a/services/usb/java/com/android/server/usb/UsbMidiDevice.java b/services/usb/java/com/android/server/usb/UsbMidiDevice.java index 725f393..df6cfbf 100644 --- a/services/usb/java/com/android/server/usb/UsbMidiDevice.java +++ b/services/usb/java/com/android/server/usb/UsbMidiDevice.java @@ -121,7 +121,7 @@ public final class UsbMidiDevice implements Closeable { int outputCount = mOutputStreams.length; mServer = midiManager.createDeviceServer(mInputPortReceivers, outputCount, - properties, MidiDeviceInfo.TYPE_USB, null); + null, null, properties, MidiDeviceInfo.TYPE_USB, null); if (mServer == null) { return false; } |