summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Marco Nelissen <marcone@google.com> 2011-05-06 15:13:44 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2011-05-06 15:13:44 -0700
commit48d4ee0101b7edd7940450f5feffebe9d2cb232b (patch)
treef9a1436d1c3a1b600db2b1213c3a9dd31c4ba1f6
parent103c5f9343e3de7d47717200632eaca327070254 (diff)
parent1b312039a046532532837efd2dac06390ab506c0 (diff)
Merge "Remove MediaStore.Audio.AudioColumns.ALBUM_ART"
-rw-r--r--api/13.txt1
-rw-r--r--api/current.txt1
-rw-r--r--core/java/android/provider/MediaStore.java6
3 files changed, 0 insertions, 8 deletions
diff --git a/api/13.txt b/api/13.txt
index a17b80cd071b..ebb4308fb3ab 100644
--- a/api/13.txt
+++ b/api/13.txt
@@ -15558,7 +15558,6 @@ package android.provider {
public static abstract interface MediaStore.Audio.AudioColumns implements android.provider.MediaStore.MediaColumns {
field public static final java.lang.String ALBUM = "album";
- field public static final java.lang.String ALBUM_ART = "album_art";
field public static final java.lang.String ALBUM_ID = "album_id";
field public static final java.lang.String ALBUM_KEY = "album_key";
field public static final java.lang.String ARTIST = "artist";
diff --git a/api/current.txt b/api/current.txt
index 950c1307cf71..1b71805ff77f 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -15630,7 +15630,6 @@ package android.provider {
public static abstract interface MediaStore.Audio.AudioColumns implements android.provider.MediaStore.MediaColumns {
field public static final java.lang.String ALBUM = "album";
- field public static final java.lang.String ALBUM_ART = "album_art";
field public static final java.lang.String ALBUM_ID = "album_id";
field public static final java.lang.String ALBUM_KEY = "album_key";
field public static final java.lang.String ARTIST = "artist";
diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java
index 02fd6e4a57d8..3bc1348bb2e9 100644
--- a/core/java/android/provider/MediaStore.java
+++ b/core/java/android/provider/MediaStore.java
@@ -1096,12 +1096,6 @@ public final class MediaStore {
public static final String ALBUM_KEY = "album_key";
/**
- * A URI to the album art, if any
- * <P>Type: TEXT</P>
- */
- public static final String ALBUM_ART = "album_art";
-
- /**
* The track number of this song on the album, if any.
* This number encodes both the track number and the
* disc number. For multi-disc sets, this number will