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

Commit aac4bfb4 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "We should pass null for the album artist if it was not set, instead of... 

Merge "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."
parents b05ec118 0096b8d7

media/java/android/media/MediaScanner.java

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

                // FIXME - add DESCRIPTION

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

                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.ARTIST, (mArtist != null && mArtist.length() > 0) ?

                        mArtist : MediaStore.UNKNOWN_STRING);

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

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

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

                        mAlbum : MediaStore.UNKNOWN_STRING);

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

                if (mYear != 0) {

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