summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorMatt Casey <mrcasey@google.com>2014-02-05 15:51:39 -0800
committerMatt Casey <mrcasey@google.com>2014-02-20 17:06:09 -0800
commitbd7bcf0fba1a991e80ea279b090aa584707fdabf (patch)
tree06eaf33d1df845627770dec45e30d8d498cd1a36 /api
parente6415f50b10fe455df2cbe568a90bc762cce3cf7 (diff)
downloadframeworks_base-bd7bcf0fba1a991e80ea279b090aa584707fdabf.zip
frameworks_base-bd7bcf0fba1a991e80ea279b090aa584707fdabf.tar.gz
frameworks_base-bd7bcf0fba1a991e80ea279b090aa584707fdabf.tar.bz2
Add more MediaStore constants for playback intents
Constants are derived from this doc: https://docs.google.com/a/google.com/document/d/1lmlFcTeefLDRp_bpMrXk3yK9nKxoTVfpcShanpLxiMg/edit#heading=h.b16863tyyjzv That doc contains the full explanation of these changes. I'm making this change on behalf of {elmas,pengr} who don't have android source access but designed this in collaboration with rharagutchi on the play music team. I'll probably have to route any significant questions through them. Bug: 12874557 Change-Id: I85a4bee57a2bde519da0dc6de2cad9d036da225c
Diffstat (limited to 'api')
-rw-r--r--api/current.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index a0a4e91..4d9fa17 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -6115,6 +6115,7 @@ package android.content {
method public final void unregisterContentObserver(android.database.ContentObserver);
method public final int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]);
method public static void validateSyncExtrasBundle(android.os.Bundle);
+ field public static final java.lang.String ANY_CURSOR_ITEM_TYPE = "vnd.android.cursor.item/*";
field public static final java.lang.String CURSOR_DIR_BASE_TYPE = "vnd.android.cursor.dir";
field public static final java.lang.String CURSOR_ITEM_BASE_TYPE = "vnd.android.cursor.item";
field public static final java.lang.String SCHEME_ANDROID_RESOURCE = "android.resource";
@@ -21560,6 +21561,8 @@ package android.provider {
field public static final java.lang.String EXTRA_MEDIA_ALBUM = "android.intent.extra.album";
field public static final java.lang.String EXTRA_MEDIA_ARTIST = "android.intent.extra.artist";
field public static final java.lang.String EXTRA_MEDIA_FOCUS = "android.intent.extra.focus";
+ field public static final java.lang.String EXTRA_MEDIA_GENRE = "android.intent.extra.genre";
+ field public static final java.lang.String EXTRA_MEDIA_RADIO_CHANNEL = "android.intent.extra.radio_channel";
field public static final java.lang.String EXTRA_MEDIA_TITLE = "android.intent.extra.title";
field public static final java.lang.String EXTRA_OUTPUT = "output";
field public static final java.lang.String EXTRA_SCREEN_ORIENTATION = "android.intent.extra.screenOrientation";
@@ -21678,6 +21681,7 @@ package android.provider {
method public static android.net.Uri getContentUriForPath(java.lang.String);
field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/audio";
field public static final java.lang.String DEFAULT_SORT_ORDER = "title_key";
+ field public static final java.lang.String ENTRY_CONTENT_TYPE = "vnd.android.cursor.item/audio";
field public static final android.net.Uri EXTERNAL_CONTENT_URI;
field public static final java.lang.String EXTRA_MAX_BYTES = "android.provider.MediaStore.extra.MAX_BYTES";
field public static final android.net.Uri INTERNAL_CONTENT_URI;
@@ -21713,6 +21717,11 @@ package android.provider {
field public static final java.lang.String NAME = "name";
}
+ public static final class MediaStore.Audio.Radio {
+ ctor public MediaStore.Audio.Radio();
+ field public static final java.lang.String ENTRY_CONTENT_TYPE = "vnd.android.cursor.item/radio";
+ }
+
public static final class MediaStore.Files {
ctor public MediaStore.Files();
method public static android.net.Uri getContentUri(java.lang.String);