Backport changes 7e94887988990e98b5c7738f393e10afa0d8ddb8 and fb5674fd0aa46a186dba929...

[android-x86/packages-apps-Music.git] / src / com / android / music / MusicBrowserActivity.java

diff --git a/src/com/android/music/MusicBrowserActivity.java b/src/com/android/music/MusicBrowserActivity.java
index 3554234..1c4a9d1 100644 (file)
--- a/src/com/android/music/MusicBrowserActivity.java
+++ b/src/com/android/music/MusicBrowserActivity.java
@@ -16,35 +16,21 @@
 
 package com.android.music;
 
+import com.android.music.MusicUtils.ServiceToken;
+
 import android.app.Activity;
-import android.app.SearchManager;
-import android.content.BroadcastReceiver;
 import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.ServiceConnection;
-import android.content.SharedPreferences;
-import android.graphics.drawable.Drawable;
-import android.media.AudioManager;
-import android.media.MediaFile;
-import android.net.Uri;
 import android.os.Bundle;
-import android.os.RemoteException;
 import android.os.IBinder;
-import android.provider.MediaStore;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.Window;
-import android.widget.ImageButton;
-import android.widget.TextView;
+import android.os.RemoteException;
 
 public class MusicBrowserActivity extends Activity
     implements MusicUtils.Defs {
 
+    private ServiceToken mToken;
+
     public MusicBrowserActivity() {
     }
 
@@ -65,13 +51,15 @@ public class MusicBrowserActivity extends Activity
         
         String shuf = getIntent().getStringExtra("autoshuffle");
         if ("true".equals(shuf)) {
-            bindService((new Intent()).setClass(this, MediaPlaybackService.class), autoshuffle, 0);
+            mToken = MusicUtils.bindToService(this, autoshuffle);
         }
     }
 
     @Override
     public void onDestroy() {
-        MusicUtils.unbindFromService(this);
+        if (mToken != null) {
+            MusicUtils.unbindFromService(mToken);
+        }
         super.onDestroy();
     }