diff options
| author | Mike Lockwood <lockwood@google.com> | 2015-04-29 20:50:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-29 20:50:35 +0000 |
| commit | e1d003958de51c135ef92ae49ebdaa0f07d959dc (patch) | |
| tree | 61c363c203e1a7923b040c9c04415eb77054c082 /api | |
| parent | 9ac2718e7dcf274ad41fbb374bedabadc558634b (diff) | |
| parent | 02868b1625f0b1fa6ce1fb2529186f155904dd03 (diff) | |
| download | frameworks_base-e1d003958de51c135ef92ae49ebdaa0f07d959dc.zip frameworks_base-e1d003958de51c135ef92ae49ebdaa0f07d959dc.tar.gz frameworks_base-e1d003958de51c135ef92ae49ebdaa0f07d959dc.tar.bz2 | |
Merge "MidiDeviceInfo: Add version string property" into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 96e5018..0aeda1c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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_SERIAL_NUMBER = "serial_number"; 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_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 8cce95c..d931493 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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_SERIAL_NUMBER = "serial_number"; 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_USB = 1; // 0x1 field public static final int TYPE_VIRTUAL = 2; // 0x2 |