Merge "Deprecate MediaStore.DownloadColumns.DESCRIPTION." into qt-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
f54654945d
@@ -38424,7 +38424,6 @@ package android.provider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static interface MediaStore.DownloadColumns extends android.provider.MediaStore.MediaColumns {
|
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 DOWNLOAD_URI = "download_uri";
|
||||||
field public static final String REFERER_URI = "referer_uri";
|
field public static final String REFERER_URI = "referer_uri";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -526,6 +526,10 @@ package android.provider {
|
|||||||
field public static final String DURATION = "duration";
|
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 {
|
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_DISPLAY_NAME = "bucket_display_name";
|
||||||
field public static final String BUCKET_ID = "bucket_id";
|
field public static final String BUCKET_ID = "bucket_id";
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ import android.annotation.UnsupportedAppUsage;
|
|||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.app.AppGlobals;
|
import android.app.AppGlobals;
|
||||||
import android.content.ClipData;
|
import android.content.ClipData;
|
||||||
import android.content.ContentInterface;
|
|
||||||
import android.content.ContentProviderClient;
|
import android.content.ContentProviderClient;
|
||||||
import android.content.ContentResolver;
|
import android.content.ContentResolver;
|
||||||
import android.content.ContentUris;
|
import android.content.ContentUris;
|
||||||
@@ -1410,7 +1409,10 @@ public final class MediaStore {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* The description of the download.
|
* The description of the download.
|
||||||
|
*
|
||||||
|
* @removed
|
||||||
*/
|
*/
|
||||||
|
@Deprecated
|
||||||
@Column(Cursor.FIELD_TYPE_STRING)
|
@Column(Cursor.FIELD_TYPE_STRING)
|
||||||
String DESCRIPTION = "description";
|
String DESCRIPTION = "description";
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user