commit 72e42791d602ad5f5923ba6bed30b9dac9fe07e8
author Marco Nelissen <marcone@google.com> Tue Nov 30 11:47:44 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 30 11:47:44 2010 -0800
tree 670c6dec15b8744129faadfc25d532c03ca76a15
parent 90e3176f6e7cb5b2a0bcf99ed0ca5e693bb28002
parent 080563ad0a9376c96354c552571561ff8df566fb

am 080563ad: When pausing, also cancel the in-progress fade in if there was one. b/3209106

* commit '080563ad0a9376c96354c552571561ff8df566fb':
  When pausing, also cancel the in-progress fade in if there was one. b/3209106

src/com/android/music/MediaPlaybackService.java

diff --git a/src/com/android/music/MediaPlaybackService.java b/src/com/android/music/MediaPlaybackService.java
index 7c0bbed..8411fc0 100644
--- a/src/com/android/music/MediaPlaybackService.java
+++ b/src/com/android/music/MediaPlaybackService.java
@@ -1123,6 +1123,7 @@
     public void pause() {
         synchronized(this) {
             if (isPlaying()) {
+                mMediaplayerHandler.removeMessages(FADEIN);
                 mPlayer.pause();
                 gotoIdleState();
                 mIsSupposedToBePlaying = false;