Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Deprecate MediaStore.DownloadColumns.DESCRIPTION." into qt-dev

Browse Source 
am: f54654945d

Change-Id: I5447c7cfb92e17ce909a0db7c324ad498de64516
This commit is contained in:
Sudheer Shanka
2019-04-13 13:19:16 -07:00
committed by android-build-merger
parent 81d7e8e37c f54654945d
commit dd820942ee
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -38424,7 +38424,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";
}

4
api/removed.txt
View File

@@ -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";

4
core/java/android/provider/MediaStore.java
View File

@@ -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";
}