summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2015-04-22 15:33:34 -0700
committerMike Lockwood <lockwood@google.com>2015-04-22 15:33:34 -0700
commitec32ac95dc3142ecec13a8b301a5ef87f5a296ef (patch)
tree3855764b64054aa217a8a4e92023e8b6e4f6b55d
parent81786701b61f8295c8f7c9c1861642233910b056 (diff)
downloadframeworks_base-ec32ac95dc3142ecec13a8b301a5ef87f5a296ef.zip
frameworks_base-ec32ac95dc3142ecec13a8b301a5ef87f5a296ef.tar.gz
frameworks_base-ec32ac95dc3142ecec13a8b301a5ef87f5a296ef.tar.bz2
Add Context.MIDI_Service to the public API
I forgot this when the rest of MidiManager was made public. Change-Id: Ic5f8e2674d5b8e13bd88feebf3cf219f7af7fbcc
-rw-r--r--api/current.txt1
-rw-r--r--api/system-current.txt1
-rw-r--r--core/java/android/content/Context.java1
3 files changed, 2 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index cdbd9d0..a9b6c6f 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -7774,6 +7774,7 @@ package android.content {
field public static final java.lang.String MEDIA_PROJECTION_SERVICE = "media_projection";
field public static final java.lang.String MEDIA_ROUTER_SERVICE = "media_router";
field public static final java.lang.String MEDIA_SESSION_SERVICE = "media_session";
+ field public static final java.lang.String MIDI_SERVICE = "midi";
field public static final int MODE_APPEND = 32768; // 0x8000
field public static final int MODE_ENABLE_WRITE_AHEAD_LOGGING = 8; // 0x8
field public static final int MODE_MULTI_PROCESS = 4; // 0x4
diff --git a/api/system-current.txt b/api/system-current.txt
index fefcd2b..1ca1141 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -7991,6 +7991,7 @@ package android.content {
field public static final java.lang.String MEDIA_PROJECTION_SERVICE = "media_projection";
field public static final java.lang.String MEDIA_ROUTER_SERVICE = "media_router";
field public static final java.lang.String MEDIA_SESSION_SERVICE = "media_session";
+ field public static final java.lang.String MIDI_SERVICE = "midi";
field public static final int MODE_APPEND = 32768; // 0x8000
field public static final int MODE_ENABLE_WRITE_AHEAD_LOGGING = 8; // 0x8
field public static final int MODE_MULTI_PROCESS = 4; // 0x4
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 3bf3f85..5eacce3 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -3098,7 +3098,6 @@ public abstract class Context {
* {@link android.media.midi.MidiManager} for accessing the MIDI service.
*
* @see #getSystemService
- * @hide
*/
public static final String MIDI_SERVICE = "midi";