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

Commit dd820942 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by android-build-merger
Browse files

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

am: f5465494

Change-Id: I5447c7cfb92e17ce909a0db7c324ad498de64516
parents 81d7e8e3 f5465494

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -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";















  }

























api/removed.txt



+4
−0




























Original line number
Diff line number
Diff line








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

































core/java/android/provider/MediaStore.java



+3
−1




























Original line number
Diff line number
Diff line








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















    }