commit d16e7d1550c235c61d99eeb96fe9e9b66d396ffc
author Marco Nelissen <marcone@google.com> Wed May 12 07:49:24 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 12 07:49:24 2010 -0700
tree af917d854348d5eaef4bdefb4605fb0773cc6737
parent 7213d243b4a0a10e23531b3b40395f036259baee
parent 80d3f584531e911b1fb5cce0bd3f8d974b4d0fcc

am 80d3f584: Remove the calls to (un)registerAudioFocusListener that are about to be hidden. Bugs 2670395 and 2599698

Merge commit '80d3f584531e911b1fb5cce0bd3f8d974b4d0fcc' into froyo-plus-aosp

* commit '80d3f584531e911b1fb5cce0bd3f8d974b4d0fcc':
  Remove the calls to (un)registerAudioFocusListener that are about

src/com/android/music/MediaPlaybackService.java

diff --git a/src/com/android/music/MediaPlaybackService.java b/src/com/android/music/MediaPlaybackService.java
index 8efadad..26b2a93 100644
--- a/src/com/android/music/MediaPlaybackService.java
+++ b/src/com/android/music/MediaPlaybackService.java
@@ -283,7 +283,6 @@
         super.onCreate();
 
         mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
-        mAudioManager.registerAudioFocusListener(mAudioFocusListener);
         mAudioManager.registerMediaButtonEventReceiver(new ComponentName(getPackageName(),
                 MediaButtonIntentReceiver.class.getName()));
         
@@ -327,7 +326,6 @@
         mPlayer = null;
 
         mAudioManager.abandonAudioFocus(mAudioFocusListener);
-        mAudioManager.unregisterAudioFocusListener(mAudioFocusListener);
         
         // make sure there aren't any other messages coming
         mDelayedStopHandler.removeCallbacksAndMessages(null);