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

Commit 873f3481 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Add AlbumColumns.ARTIST_ID." into qt-dev 

am: 9cbf23f1

Change-Id: Ia4f1da6a5be9e5665f23a16b24393206331718b7
parents 751c2781 9cbf23f1

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -38537,6 +38537,7 @@ package android.provider { 
    field public static final String ALBUM_ID = "album_id";

    field public static final String ALBUM_KEY = "album_key";

    field public static final String ARTIST = "artist";

    field public static final String ARTIST_ID = "artist_id";

    field public static final String FIRST_YEAR = "minyear";

    field public static final String LAST_YEAR = "maxyear";

    field public static final String NUMBER_OF_SONGS = "numsongs";

core/java/android/provider/MediaStore.java

+7 −1
Original line number Diff line number Diff line
@@ -2676,7 +2676,13 @@ public final class MediaStore { 
            public static final String ALBUM = "album";



            /**

             * The artist whose songs appear on this album

             * The ID of the artist whose songs appear on this album.

             */

            @Column(value = Cursor.FIELD_TYPE_INTEGER, readOnly = true)

            public static final String ARTIST_ID = "artist_id";



            /**

             * The name of the artist whose songs appear on this album.

             */

            @Column(value = Cursor.FIELD_TYPE_STRING, readOnly = true)

            public static final String ARTIST = "artist";