am dc08ff9b: am 4b83a8c0: Fix crash in audio preview.
Merge commit 'dc08ff9b56a0279bf40a59b0e3b2a4a6940ed644'
* commit 'dc08ff9b56a0279bf40a59b0e3b2a4a6940ed644':
Fix crash in audio preview.
diff --git a/src/com/android/music/AudioPreview.java b/src/com/android/music/AudioPreview.java
index 3638982..22c9c7d 100644
--- a/src/com/android/music/AudioPreview.java
+++ b/src/com/android/music/AudioPreview.java
@@ -166,10 +166,10 @@
MediaStore.Audio.Media.TITLE, MediaStore.Audio.Media.ARTIST},
null, null, null);
} else {
- // try to get the display name from another content provider
- mAsyncQueryHandler.startQuery(0, null, mUri, new String [] {
- OpenableColumns.DISPLAY_NAME},
- null, null, null);
+ // Try to get the display name from another content provider.
+ // Don't specifically ask for the display name though, since the
+ // provider might not actually support that column.
+ mAsyncQueryHandler.startQuery(0, null, mUri, null, null, null, null);
}
} else if (scheme.equals("file")) {
// check if this file is in the media database (clicking on a download