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

Commit 4670a92f authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "MediaScanner: disable album artist support until MediaProvider really supports it"

parents 806de5b1 ff371cf0

media/java/android/media/MediaScanner.java

+3 −2
Original line number Diff line number Diff line
@@ -644,8 +644,9 @@ public class MediaScanner 
            } else if (MediaFile.isAudioFileType(mFileType)) {

                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);

// disable album artist support until MediaProvider really supports it

//                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);