diff options
| -rw-r--r-- | src/com/android/providers/media/MediaDocumentsProvider.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/com/android/providers/media/MediaDocumentsProvider.java b/src/com/android/providers/media/MediaDocumentsProvider.java index a887a83f..751ccd30 100644 --- a/src/com/android/providers/media/MediaDocumentsProvider.java +++ b/src/com/android/providers/media/MediaDocumentsProvider.java @@ -35,6 +35,7 @@ import android.provider.DocumentsContract; import android.provider.DocumentsContract.Document; import android.provider.DocumentsContract.Root; import android.provider.DocumentsProvider; +import android.provider.MediaStore; import android.provider.MediaStore.Audio; import android.provider.MediaStore.Audio.AlbumColumns; import android.provider.MediaStore.Audio.Albums; @@ -684,7 +685,8 @@ public class MediaDocumentsProvider extends DocumentsProvider { final RowBuilder row = result.newRow(); row.add(Document.COLUMN_DOCUMENT_ID, docId); - row.add(Document.COLUMN_DISPLAY_NAME, cursor.getString(ArtistQuery.ARTIST)); + row.add(Document.COLUMN_DISPLAY_NAME, + cleanUpMediaDisplayName(cursor.getString(ArtistQuery.ARTIST))); row.add(Document.COLUMN_MIME_TYPE, Document.MIME_TYPE_DIR); } @@ -703,7 +705,8 @@ public class MediaDocumentsProvider extends DocumentsProvider { final RowBuilder row = result.newRow(); row.add(Document.COLUMN_DOCUMENT_ID, docId); - row.add(Document.COLUMN_DISPLAY_NAME, cursor.getString(AlbumQuery.ALBUM)); + row.add(Document.COLUMN_DISPLAY_NAME, + cleanUpMediaDisplayName(cursor.getString(AlbumQuery.ALBUM))); row.add(Document.COLUMN_MIME_TYPE, Document.MIME_TYPE_DIR); } @@ -920,4 +923,11 @@ public class MediaDocumentsProvider extends DocumentsProvider { IoUtils.closeQuietly(cursor); } } + + private String cleanUpMediaDisplayName(String displayName) { + if (!MediaStore.UNKNOWN_STRING.equals(displayName)) { + return displayName; + } + return getContext().getResources().getString(com.android.internal.R.string.unknownName); + } } |