summaryrefslogtreecommitdiffstats
path: root/v4/api21/android
diff options
context:
space:
mode:
authorIan Lake <ilake@google.com>2015-04-09 09:32:52 -0700
committerIan Lake <ilake@google.com>2015-04-09 09:32:52 -0700
commit26d994357fa4dbcd813f1c066ce09d5fdaa301a9 (patch)
tree6c3c16c9415b99d6ead0dc4290e4577e985dd66f /v4/api21/android
parent73a0c3c71f0d0a756664652de74c2e55dc31dbc3 (diff)
downloadandroid_frameworks_support-26d994357fa4dbcd813f1c066ce09d5fdaa301a9.tar.gz
android_frameworks_support-26d994357fa4dbcd813f1c066ce09d5fdaa301a9.tar.bz2
android_frameworks_support-26d994357fa4dbcd813f1c066ce09d5fdaa301a9.zip
Forward all MediaSession callbacks to MediaSessionCompat
Adds missing callbacks to onCustomAction(), onPlayFromMediaId(), onSkipToQueueItem(), and onPlayFromSearch() in MediaSessionCompatApi21.CallbackProxy. This allows the support library callback registered via MediaSessionCompat.setCallback() to receive these callbacks. BUG: 20129394 Change-Id: Ibef12730c0dd15932a47ba44d69e8f06e11c4db5
Diffstat (limited to 'v4/api21/android')
-rw-r--r--v4/api21/android/support/v4/media/session/MediaSessionCompatApi21.java20
1 files changed, 20 insertions, 0 deletions
diff --git a/v4/api21/android/support/v4/media/session/MediaSessionCompatApi21.java b/v4/api21/android/support/v4/media/session/MediaSessionCompatApi21.java
index 9b07ea085c..d5f5853afa 100644
--- a/v4/api21/android/support/v4/media/session/MediaSessionCompatApi21.java
+++ b/v4/api21/android/support/v4/media/session/MediaSessionCompatApi21.java
@@ -173,6 +173,21 @@ class MediaSessionCompatApi21 {
}
@Override
+ public void onPlayFromMediaId(String mediaId, Bundle extras) {
+ mCallback.onPlayFromMediaId(mediaId, extras);
+ }
+
+ @Override
+ public void onPlayFromSearch(String search, Bundle extras) {
+ mCallback.onPlayFromSearch(search, extras);
+ }
+
+ @Override
+ public void onSkipToQueueItem(long id) {
+ mCallback.onSkipToQueueItem(id);
+ }
+
+ @Override
public void onPause() {
mCallback.onPause();
}
@@ -211,6 +226,11 @@ class MediaSessionCompatApi21 {
public void onSetRating(Rating rating) {
mCallback.onSetRating(rating);
}
+
+ @Override
+ public void onCustomAction(String action, Bundle extras) {
+ mCallback.onCustomAction(action, extras);
+ }
}
static class QueueItem {