From: Marco Nelissen <marcone@google.com>
Date: Thu, 28 Jan 2010 02:44:52 +0000 (-0800)
Subject: Make the bind/unbind utility methods work for activities in an activitygroup too.
X-Git-Tag: android-x86-2.2~42
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fpackages-apps-Music.git;a=commitdiff_plain;h=3b55356662437499c38418629a38c8fb08880302

Make the bind/unbind utility methods work for activities in an activitygroup too.
---

diff --git a/src/com/android/music/MusicUtils.java b/src/com/android/music/MusicUtils.java
index d1314bf..1b72e58 100644
--- a/src/com/android/music/MusicUtils.java
+++ b/src/com/android/music/MusicUtils.java
@@ -159,22 +159,31 @@ public class MusicUtils {
         }
     }
 
-    public static ServiceToken bindToService(Context context) {
+    public static ServiceToken bindToService(Activity context) {
         return bindToService(context, null);
     }
 
-    public static ServiceToken bindToService(Context context, ServiceConnection callback) {
-        ContextWrapper cw = new ContextWrapper(context);
+    public static ServiceToken bindToService(Activity context, ServiceConnection callback) {
+        Activity realActivity = context.getParent();
+        if (realActivity == null) {
+            realActivity = context;
+        }
+        ContextWrapper cw = new ContextWrapper(realActivity);
         cw.startService(new Intent(cw, MediaPlaybackService.class));
         ServiceBinder sb = new ServiceBinder(callback);
         if (cw.bindService((new Intent()).setClass(cw, MediaPlaybackService.class), sb, 0)) {
             sConnectionMap.put(cw, sb);
             return new ServiceToken(cw);
         }
+        Log.e("Music", "Failed to bind to service");
         return null;
     }
 
     public static void unbindFromService(ServiceToken token) {
+        if (token == null) {
+            Log.e("MusicUtils", "Trying to unbind with null token");
+            return;
+        }
         ContextWrapper cw = token.mWrappedContext;
         ServiceBinder sb = sConnectionMap.remove(cw);
         if (sb == null) {