diff options
| author | Mike Lockwood <lockwood@google.com> | 2015-03-19 17:10:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-19 17:10:17 +0000 |
| commit | ac9e2d756e44a81cf894c959156712d040c7acdd (patch) | |
| tree | a49ca2062d043f2355963a9cc7f53bbbb1f3b7cc | |
| parent | 543a3578ad0a1d0214b9102ddec0fc26a0e5d63e (diff) | |
| parent | 3f5acc6d48337da1609f672d4385b1f170ec7f3e (diff) | |
| download | frameworks_base-ac9e2d756e44a81cf894c959156712d040c7acdd.zip frameworks_base-ac9e2d756e44a81cf894c959156712d040c7acdd.tar.gz frameworks_base-ac9e2d756e44a81cf894c959156712d040c7acdd.tar.bz2 | |
Merge "MidiDeviceInfo: Add constants for future Bluetooth MIDI support"
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | media/java/android/media/midi/MidiDeviceInfo.java | 12 |
3 files changed, 16 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 6d311d5..29f0a29 100644 --- a/api/current.txt +++ b/api/current.txt @@ -16598,11 +16598,13 @@ package android.media.midi { method public boolean isPrivate(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.media.midi.MidiDeviceInfo> CREATOR; + field public static final java.lang.String PROPERTY_BLUETOOTH_DEVICE = "bluetooth_device"; field public static final java.lang.String PROPERTY_MANUFACTURER = "manufacturer"; field public static final java.lang.String PROPERTY_NAME = "name"; 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_USB_DEVICE = "usb_device"; + field public static final int TYPE_BLUETOOTH = 3; // 0x3 field public static final int TYPE_USB = 1; // 0x1 field public static final int TYPE_VIRTUAL = 2; // 0x2 } diff --git a/api/system-current.txt b/api/system-current.txt index 1237267..c98f7a3 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -17853,11 +17853,13 @@ package android.media.midi { method public boolean isPrivate(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.media.midi.MidiDeviceInfo> CREATOR; + field public static final java.lang.String PROPERTY_BLUETOOTH_DEVICE = "bluetooth_device"; field public static final java.lang.String PROPERTY_MANUFACTURER = "manufacturer"; field public static final java.lang.String PROPERTY_NAME = "name"; 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_USB_DEVICE = "usb_device"; + field public static final int TYPE_BLUETOOTH = 3; // 0x3 field public static final int TYPE_USB = 1; // 0x1 field public static final int TYPE_VIRTUAL = 2; // 0x2 } diff --git a/media/java/android/media/midi/MidiDeviceInfo.java b/media/java/android/media/midi/MidiDeviceInfo.java index 93e0939..7201e25 100644 --- a/media/java/android/media/midi/MidiDeviceInfo.java +++ b/media/java/android/media/midi/MidiDeviceInfo.java @@ -43,6 +43,11 @@ public final class MidiDeviceInfo implements Parcelable { public static final int TYPE_VIRTUAL = 2; /** + * Constant representing Bluetooth MIDI devices for {@link #getType} + */ + public static final int TYPE_BLUETOOTH = 3; + + /** * Bundle key for the device's user visible name property. * Used with the {@link android.os.Bundle} returned by {@link #getProperties}. * For USB devices, this is a concatenation of the manufacturer and product names. @@ -78,6 +83,13 @@ public final class MidiDeviceInfo implements Parcelable { public static final String PROPERTY_USB_DEVICE = "usb_device"; /** + * Bundle key for the device's {@link android.bluetooth.BluetoothDevice}. + * Only set for Bluetooth MIDI devices. + * Used with the {@link android.os.Bundle} returned by {@link #getProperties} + */ + public static final String PROPERTY_BLUETOOTH_DEVICE = "bluetooth_device"; + + /** * Bundle key for the device's ALSA card number. * Only set for USB MIDI devices. * Used with the {@link android.os.Bundle} returned by {@link #getProperties} |