commit 0096b8d7d119281466763160d5c88c5f9832d005
author Marco Nelissen <marcone@google.com> Fri Mar 19 08:05:53 2010 -0700
committer Marco Nelissen <marcone@google.com> Fri Mar 19 08:07:26 2010 -0700
tree ed3ce33370f2cfdd20b2825cbfe687a266caa077
parent abc2819328c32f2f66506d342c5f560da5107889

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

media/java/android/media/MediaScanner.java

diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index e9bcafe..f845fec1 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -634,12 +634,12 @@
             } 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);