diff options
| author | Mike Lockwood <lockwood@google.com> | 2015-04-29 21:26:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-29 21:26:01 +0000 |
| commit | 4e1716528773deed85564624efb806e4a11fa0a0 (patch) | |
| tree | e2a765b13dc09dfe61647e28e77b9ae6618ebe89 /media | |
| parent | c5cbdfcfe517b55cd4578e5e5b6a682fcfdffbc7 (diff) | |
| parent | 62b4cbceb33dc657cfaee2971ad6bc3d1aab3fbb (diff) | |
| download | frameworks_base-4e1716528773deed85564624efb806e4a11fa0a0.zip frameworks_base-4e1716528773deed85564624efb806e4a11fa0a0.tar.gz frameworks_base-4e1716528773deed85564624efb806e4a11fa0a0.tar.bz2 | |
am 62b4cbce: am bcec6a49: am e1d00395: Merge "MidiDeviceInfo: Add version string property" into mnc-dev
* commit '62b4cbceb33dc657cfaee2971ad6bc3d1aab3fbb':
MidiDeviceInfo: Add version string property
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/midi/MidiDeviceInfo.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/media/java/android/media/midi/MidiDeviceInfo.java b/media/java/android/media/midi/MidiDeviceInfo.java index af108eb..35374ed 100644 --- a/media/java/android/media/midi/MidiDeviceInfo.java +++ b/media/java/android/media/midi/MidiDeviceInfo.java @@ -69,6 +69,13 @@ public final class MidiDeviceInfo implements Parcelable { 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. * Used with the {@link android.os.Bundle} returned by {@link #getProperties} * Matches the USB device serial number for USB MIDI devices. |