commit ba37fff419853e6aa3bf0aa8b73bf15812f107a5
author Marco Nelissen <marcone@google.com> Wed Dec 01 03:35:11 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Dec 01 03:35:11 2010 -0800
tree fa9f2817ecf1dd155cc9f8d52a5d59270b742e61
parent 99ddc258f6e13501bb0022b374ec30e96670fb1c
parent 72e42791d602ad5f5923ba6bed30b9dac9fe07e8

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

* commit '72e42791d602ad5f5923ba6bed30b9dac9fe07e8':
  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 e033b80..608b3ff 100644
--- a/src/com/android/music/MediaPlaybackService.java
+++ b/src/com/android/music/MediaPlaybackService.java
@@ -1142,6 +1142,7 @@
     public void pause() {
         synchronized(this) {
             if (isPlaying()) {
+                mMediaplayerHandler.removeMessages(FADEIN);
                 mPlayer.pause();
                 gotoIdleState();
                 mIsSupposedToBePlaying = false;