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

Commit abc28193 authored by Marco Nelissen's avatar Marco Nelissen
Browse files

Include "album artist" when inserting items in the media provider. 

Change-Id: Ic34e2d54557409866dc35c29ee397afdfe874762
parent b82ac6bf

core/java/android/provider/MediaStore.java

+7 −0
Original line number Diff line number Diff line
@@ -869,6 +869,13 @@ public final class MediaStore { 
             */

            public static final String ARTIST = "artist";



            /**

             * The artist credited for the album that contains the audio file

             * <P>Type: TEXT</P>

             * @hide

             */

            public static final String ALBUM_ARTIST = "album_artist";



            /**

             * A non human readable key calculated from the ARTIST, used for

             * searching, sorting and grouping

media/java/android/media/MediaScanner.java

+5 −1
Original line number Diff line number Diff line
@@ -634,7 +634,11 @@ public class MediaScanner 
            } else if (MediaFile.isImageFileType(mFileType)) {

                // FIXME - add DESCRIPTION

            } else if (MediaFile.isAudioFileType(mFileType)) {

                map.put(Audio.Media.ARTIST, (mArtist != null && mArtist.length() > 0 ? mArtist : MediaStore.UNKNOWN_STRING));

                String artist = mArtist != null && mArtist.length() > 0 ?

                        mArtist : MediaStore.UNKNOWN_STRING;

                map.put(Audio.Media.ARTIST, artist);

                map.put(Audio.Media.ALBUM_ARTIST, mAlbumArtist != null &&

                        mAlbumArtist.length() > 0 ? mAlbumArtist : artist);

                map.put(Audio.Media.ALBUM, (mAlbum != null && mAlbum.length() > 0 ? mAlbum : MediaStore.UNKNOWN_STRING));

                map.put(Audio.Media.COMPOSER, mComposer);

                if (mYear != 0) {