am 5edd0cbd: Fix build.

Merge commit '5edd0cbd1ae954dc8e97daef1a99375246bf985c' into eclair-mr2

* commit '5edd0cbd1ae954dc8e97daef1a99375246bf985c':
  Fix build.

diff --combined src/com/android/music/AlbumBrowserActivity.java
index be116ca,fa6eeb4..8fe222d
--- 1/src/com/android/music/AlbumBrowserActivity.java
--- 2/src/com/android/music/AlbumBrowserActivity.java
+++ b/src/com/android/music/AlbumBrowserActivity.java
@@@ -157,12 -157,11 +157,12 @@@ public class AlbumBrowserActivity exten
          mLastListPosCourse = lv.getFirstVisiblePosition();
          mLastListPosFine = lv.getChildAt(0).getTop();
          MusicUtils.unbindFromService(this);
 -        if (!mAdapterSent) {
 -            Cursor c = mAdapter.getCursor();
 -            if (c != null) {
 -                c.close();
 -            }
 +        // If we have an adapter and didn't send it off to another activity yet, we should
 +        // close its cursor, which we do by assigning a null cursor to it. Doing this
 +        // instead of closing the cursor directly keeps the framework from accessing
 +        // the closed cursor later.
 +        if (!mAdapterSent && mAdapter != null) {
 +            mAdapter.changeCursor(null);
          }
          // Because we pass the adapter to the next activity, we need to make
          // sure it doesn't keep a reference to this activity. We can do this
@@@ -630,10 -629,6 +630,10 @@@
          
          @Override
          public void changeCursor(Cursor cursor) {
 +            if (mActivity.isFinishing() && cursor != null) {
 +                cursor.close();
 +                cursor = null;
 +            }
              if (cursor != mActivity.mAlbumCursor) {
                  mActivity.mAlbumCursor = cursor;
                  getColumnIndices(cursor);
@@@ -671,12 -666,10 +671,10 @@@
      private Cursor mAlbumCursor;
      private String mArtistId;
  
-     @Override
      public void onServiceConnected(ComponentName name, IBinder service) {
          MusicUtils.updateNowPlaying(this);
      }
  
-     @Override
      public void onServiceDisconnected(ComponentName name) {
          finish();
      }

diff --combined src/com/android/music/ArtistAlbumBrowserActivity.java
index 4fb269d,cc793df..1ab0ee9
--- 1/src/com/android/music/ArtistAlbumBrowserActivity.java
--- 2/src/com/android/music/ArtistAlbumBrowserActivity.java
+++ b/src/com/android/music/ArtistAlbumBrowserActivity.java
@@@ -164,12 -164,11 +164,12 @@@ public class ArtistAlbumBrowserActivit
          mLastListPosFine = lv.getChildAt(0).getTop();
          
          MusicUtils.unbindFromService(this);
 -        if (!mAdapterSent) {
 -            Cursor c = mAdapter.getCursor();
 -            if (c != null) {
 -                c.close();
 -            }
 +        // If we have an adapter and didn't send it off to another activity yet, we should
 +        // close its cursor, which we do by assigning a null cursor to it. Doing this
 +        // instead of closing the cursor directly keeps the framework from accessing
 +        // the closed cursor later.
 +        if (!mAdapterSent && mAdapter != null) {
 +            mAdapter.changeCursor(null);
          }
          // Because we pass the adapter to the next activity, we need to make
          // sure it doesn't keep a reference to this activity. We can do this
@@@ -818,10 -817,6 +818,10 @@@
  
          @Override
          public void changeCursor(Cursor cursor) {
 +            if (mActivity.isFinishing() && cursor != null) {
 +                cursor.close();
 +                cursor = null;
 +            }
              if (cursor != mActivity.mArtistCursor) {
                  mActivity.mArtistCursor = cursor;
                  getColumnIndices(cursor);
@@@ -858,12 -853,10 +858,10 @@@
      
      private Cursor mArtistCursor;
  
-     @Override
      public void onServiceConnected(ComponentName name, IBinder service) {
          MusicUtils.updateNowPlaying(this);
      }
  
-     @Override
      public void onServiceDisconnected(ComponentName name) {
          finish();
      }