commit 6a9c41ccabded4f0d25288ad98788a1994824bb7
author The Android Open Source Project <initial-contribution@android.com> Mon Mar 09 11:52:14 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Mon Mar 09 11:52:14 2009 -0700
tree e07c655d57dc83a4981dcd5a8e7bbcb9babfa839
parent 792a2206a4f05f6bd13fce902d3663892d2947af

auto import from //branches/cupcake/...@137197

src/com/android/music/AlbumBrowserActivity.java

diff --git a/src/com/android/music/AlbumBrowserActivity.java b/src/com/android/music/AlbumBrowserActivity.java
index c28b7da..020c0a6 100644
--- a/src/com/android/music/AlbumBrowserActivity.java
+++ b/src/com/android/music/AlbumBrowserActivity.java
@@ -217,7 +217,7 @@
         if (mAlbumCursor != null && mAlbumCursor.getCount() > 0) {
             mAlbumCursor.moveToFirst();
             fancyName = mAlbumCursor.getString(3);
-            if (MediaFile.UNKNOWN_STRING.equals(fancyName))
+            if (fancyName == null || fancyName.equals(MediaFile.UNKNOWN_STRING))
                 fancyName = getText(R.string.unknown_artist_name);
         }
 
@@ -338,9 +338,6 @@
     @Override
     protected void onListItemClick(ListView l, View v, int position, long id)
     {
-        if (mHasHeader) {
-            position --;
-        }
         Intent intent = new Intent(Intent.ACTION_PICK);
         intent.setDataAndType(Uri.EMPTY, "vnd.android.cursor.dir/track");
         intent.putExtra("album", Long.valueOf(id).toString());
@@ -560,7 +557,7 @@
 
             String name = cursor.getString(mAlbumIdx);
             String displayname = name;
-            boolean unknown = name.equals(MediaFile.UNKNOWN_STRING); 
+            boolean unknown = name == null || name.equals(MediaFile.UNKNOWN_STRING); 
             if (unknown) {
                 displayname = mUnknownAlbum;
             }
@@ -568,7 +565,7 @@
             
             name = cursor.getString(mArtistIdx);
             displayname = name;
-            if (MediaFile.UNKNOWN_STRING.equals(name)) {
+            if (name == null || name.equals(MediaFile.UNKNOWN_STRING)) {
                 displayname = mUnknownArtist;
             }
             vh.line2.setText(displayname);
@@ -633,6 +630,5 @@
 
     private Cursor mAlbumCursor;
     private String mArtistId;
-    private boolean mHasHeader = false;
 }