Fix more bugs when no music is present.

diff --git a/src/com/android/music/AlbumBrowserActivity.java b/src/com/android/music/AlbumBrowserActivity.java
index bfa683e..ba3e212 100644 (file)
--- a/src/com/android/music/AlbumBrowserActivity.java
+++ b/src/com/android/music/AlbumBrowserActivity.java
@@ -156,7 +156,10 @@ public class AlbumBrowserActivity extends ListActivity
         ListView lv = getListView();
         if (lv != null) {
             mLastListPosCourse = lv.getFirstVisiblePosition();
-            mLastListPosFine = lv.getChildAt(0).getTop();
+            View cv = lv.getChildAt(0);
+            if (cv != null) {
+                mLastListPosFine = cv.getTop();
+            }
         }
         MusicUtils.unbindFromService(this);
         if (!mAdapterSent) {

diff --git a/src/com/android/music/ArtistAlbumBrowserActivity.java b/src/com/android/music/ArtistAlbumBrowserActivity.java
index 46afeda..0fd7735 100644 (file)
--- a/src/com/android/music/ArtistAlbumBrowserActivity.java
+++ b/src/com/android/music/ArtistAlbumBrowserActivity.java
@@ -162,7 +162,10 @@ public class ArtistAlbumBrowserActivity extends ExpandableListActivity
         ExpandableListView lv = getExpandableListView();
         if (lv != null) {
             mLastListPosCourse = lv.getFirstVisiblePosition();
-            mLastListPosFine = lv.getChildAt(0).getTop();
+            View cv = lv.getChildAt(0);
+            if (cv != null) {
+                mLastListPosFine = cv.getTop();
+            }
         }
         
         MusicUtils.unbindFromService(this);

diff --git a/src/com/android/music/PlaylistBrowserActivity.java b/src/com/android/music/PlaylistBrowserActivity.java
index edd8d4f..447c75b 100644 (file)
--- a/src/com/android/music/PlaylistBrowserActivity.java
+++ b/src/com/android/music/PlaylistBrowserActivity.java
@@ -177,7 +177,10 @@ public class PlaylistBrowserActivity extends ListActivity
         ListView lv = getListView();
         if (lv != null) {
             mLastListPosCourse = lv.getFirstVisiblePosition();
-            mLastListPosFine = lv.getChildAt(0).getTop();
+            View cv = lv.getChildAt(0);
+            if (cv != null) {
+                mLastListPosFine = cv.getTop();
+            }
         }
         MusicUtils.unbindFromService(this);
         if (!mAdapterSent) {

diff --git a/src/com/android/music/TrackBrowserActivity.java b/src/com/android/music/TrackBrowserActivity.java
index 53fc34d..8f33958 100644 (file)
--- a/src/com/android/music/TrackBrowserActivity.java
+++ b/src/com/android/music/TrackBrowserActivity.java
@@ -236,7 +236,10 @@ public class TrackBrowserActivity extends ListActivity
         ListView lv = getListView();
         if (lv != null) {
             mLastListPosCourse = lv.getFirstVisiblePosition();
-            mLastListPosFine = lv.getChildAt(0).getTop();
+            View cv = lv.getChildAt(0);
+            if (cv != null) {
+                mLastListPosFine = cv.getTop();
+            }
         }
         MusicUtils.unbindFromService(this);
         try {