diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/removed.txt | 4 | ||||
| -rw-r--r-- | core/java/android/provider/MediaStore.java | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index a397bfb1c9b7..c42a347e9bcc 100644 --- a/api/current.txt +++ b/api/current.txt @@ -38664,7 +38664,6 @@ package android.provider { } public static interface MediaStore.DownloadColumns extends android.provider.MediaStore.MediaColumns { - field public static final String DESCRIPTION = "description"; field public static final String DOWNLOAD_URI = "download_uri"; field public static final String REFERER_URI = "referer_uri"; } diff --git a/api/removed.txt b/api/removed.txt index 20304a0f72de..883632623a83 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -526,6 +526,10 @@ package android.provider { field public static final String DURATION = "duration"; } + public static interface MediaStore.DownloadColumns extends android.provider.MediaStore.MediaColumns { + field @Deprecated public static final String DESCRIPTION = "description"; + } + public static interface MediaStore.Images.ImageColumns extends android.provider.MediaStore.MediaColumns { field public static final String BUCKET_DISPLAY_NAME = "bucket_display_name"; field public static final String BUCKET_ID = "bucket_id"; diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java index 7ed8e2499aad..bff8328defa0 100644 --- a/core/java/android/provider/MediaStore.java +++ b/core/java/android/provider/MediaStore.java @@ -31,7 +31,6 @@ import android.annotation.UnsupportedAppUsage; import android.app.Activity; import android.app.AppGlobals; import android.content.ClipData; -import android.content.ContentInterface; import android.content.ContentProviderClient; import android.content.ContentResolver; import android.content.ContentUris; @@ -1410,7 +1409,10 @@ public final class MediaStore { /** * The description of the download. + * + * @removed */ + @Deprecated @Column(Cursor.FIELD_TYPE_STRING) String DESCRIPTION = "description"; } |