Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5282796a authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

MediaStore deprecations for Q. 

Mark "_data" columns as explicitly deprecated, since they'll only
work for pre-Q apps.

Bug: 111268862
Test: manual
Change-Id: I86f597f1245cc255f6ee114957829763b1a76e4c
parent 4e5efa31

api/current.txt

+13 −13
Original line number Diff line number Diff line
@@ -36738,7 +36738,7 @@ package android.provider { 














  public static abstract interface MediaStore.Audio.AlbumColumns {















    field public static final java.lang.String ALBUM = "album";













    field public static final java.lang.String ALBUM_ART = "album_art";













    field public static final deprecated 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";










@@ -36860,7 +36860,7 @@ package android.provider {













  }





























  public static abstract interface MediaStore.Audio.PlaylistsColumns {













    field public static final java.lang.String DATA = "_data";













    field public static final deprecated java.lang.String DATA = "_data";















    field public static final java.lang.String DATE_ADDED = "date_added";















    field public static final java.lang.String DATE_MODIFIED = "date_modified";















    field public static final java.lang.String NAME = "name";










@@ -36922,15 +36922,15 @@ package android.provider {



























  public static class MediaStore.Images.Thumbnails implements android.provider.BaseColumns {















    ctor public MediaStore.Images.Thumbnails();













    method public static void cancelThumbnailRequest(android.content.ContentResolver, long);













    method public static void cancelThumbnailRequest(android.content.ContentResolver, long, long);













    method public static deprecated void cancelThumbnailRequest(android.content.ContentResolver, long);













    method public static deprecated void cancelThumbnailRequest(android.content.ContentResolver, long, long);















    method public static android.net.Uri getContentUri(java.lang.String);













    method public static android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, int, android.graphics.BitmapFactory.Options);













    method public static android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, long, int, android.graphics.BitmapFactory.Options);













    method public static deprecated android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, int, android.graphics.BitmapFactory.Options);













    method public static deprecated android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, long, int, android.graphics.BitmapFactory.Options);















    method public static final android.database.Cursor query(android.content.ContentResolver, android.net.Uri, java.lang.String[]);















    method public static final android.database.Cursor queryMiniThumbnail(android.content.ContentResolver, long, int, java.lang.String[]);















    method public static final android.database.Cursor queryMiniThumbnails(android.content.ContentResolver, android.net.Uri, int, java.lang.String[]);













    field public static final java.lang.String DATA = "_data";













    field public static final deprecated java.lang.String DATA = "_data";















    field public static final java.lang.String DEFAULT_SORT_ORDER = "image_id ASC";















    field public static final android.net.Uri EXTERNAL_CONTENT_URI;















    field public static final int FULL_SCREEN_KIND = 2; // 0x2









@@ -36945,7 +36945,7 @@ package android.provider {













  }





























  public static abstract interface MediaStore.MediaColumns implements android.provider.BaseColumns {













    field public static final java.lang.String DATA = "_data";













    field public static final deprecated java.lang.String DATA = "_data";















    field public static final java.lang.String DATE_ADDED = "date_added";















    field public static final java.lang.String DATE_MODIFIED = "date_modified";















    field public static final java.lang.String DISPLAY_NAME = "_display_name";










@@ -36973,12 +36973,12 @@ package android.provider {



























  public static class MediaStore.Video.Thumbnails implements android.provider.BaseColumns {















    ctor public MediaStore.Video.Thumbnails();













    method public static void cancelThumbnailRequest(android.content.ContentResolver, long);













    method public static void cancelThumbnailRequest(android.content.ContentResolver, long, long);













    method public static deprecated void cancelThumbnailRequest(android.content.ContentResolver, long);













    method public static deprecated void cancelThumbnailRequest(android.content.ContentResolver, long, long);















    method public static android.net.Uri getContentUri(java.lang.String);













    method public static android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, int, android.graphics.BitmapFactory.Options);













    method public static android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, long, int, android.graphics.BitmapFactory.Options);













    field public static final java.lang.String DATA = "_data";













    method public static deprecated android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, int, android.graphics.BitmapFactory.Options);













    method public static deprecated android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, long, int, android.graphics.BitmapFactory.Options);













    field public static final deprecated java.lang.String DATA = "_data";















    field public static final java.lang.String DEFAULT_SORT_ORDER = "video_id ASC";















    field public static final android.net.Uri EXTERNAL_CONTENT_URI;















    field public static final int FULL_SCREEN_KIND = 2; // 0x2

























core/java/android/provider/MediaStore.java



+172
−92


























File changed.
Preview size limit exceeded, changes collapsed.