commit ed9fd3ceff8d7be1d845d3a5ddb74d8918069392
author Ian Lake <ilake@google.com> Sat Jun 27 02:50:08 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Jun 27 02:50:08 2015 +0000
tree 7c654af6ad17f040436a13f8b31d6c55a023c448
parent adc6e503d75e4e6b0838f65103259aad1c156c98
parent 22c63b99c2e69f5a87b21887ece75c19112f99fe

am 22c63b99: Merge "Ensure MediaSessionCompat.Callback behavior matches framework" into lmp-mr1-ub-dev

* commit '22c63b99c2e69f5a87b21887ece75c19112f99fe':
  Ensure MediaSessionCompat.Callback behavior matches framework

v4/api21/android/support/v4/media/session/MediaSessionCompatApi21.java

diff --git a/v4/api21/android/support/v4/media/session/MediaSessionCompatApi21.java b/v4/api21/android/support/v4/media/session/MediaSessionCompatApi21.java
index d5f5853..8094391 100644
--- a/v4/api21/android/support/v4/media/session/MediaSessionCompatApi21.java
+++ b/v4/api21/android/support/v4/media/session/MediaSessionCompatApi21.java
@@ -164,7 +164,8 @@
 
         @Override
         public boolean onMediaButtonEvent(Intent mediaButtonIntent) {
-            return mCallback.onMediaButtonEvent(mediaButtonIntent);
+            return mCallback.onMediaButtonEvent(mediaButtonIntent)
+                    || super.onMediaButtonEvent(mediaButtonIntent);
         }
 
         @Override