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

Commit 0096b8d7 authored by Marco Nelissen's avatar Marco Nelissen
Browse files

We should pass null for the album artist if it was not set, instead of a copy 

of the artist, since the media provider needs to know whether the album artist
was actually set.

Change-Id: I29b885c8293609299a55babadf9ca2a30e20e5bd
parent abc28193

media/java/android/media/MediaScanner.java

+6 −6
Original line number Original line Diff line number Diff line
@@ -634,12 +634,12 @@ public class MediaScanner 
            } else if (MediaFile.isImageFileType(mFileType)) {

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

                // FIXME - add DESCRIPTION

                // FIXME - add DESCRIPTION

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

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

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

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

                        mArtist : MediaStore.UNKNOWN_STRING;

                        mArtist : MediaStore.UNKNOWN_STRING);

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

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

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

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

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

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

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

                        mAlbum : MediaStore.UNKNOWN_STRING);

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

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

                if (mYear != 0) {

                if (mYear != 0) {

                    map.put(Audio.Media.YEAR, mYear);

                    map.put(Audio.Media.YEAR, mYear);