summaryrefslogtreecommitdiffstats
path: root/v4/api21/android
diff options
context:
space:
mode:
authorIan Lake <ilake@google.com>2015-04-09 18:07:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-09 18:07:47 +0000
commit49c71910b7a13c6914fd57a682868e4fc1795e51 (patch)
treec997091f1c61277357ae1ebaf153576c358d7c6f /v4/api21/android
parentc005695ca3e01efb3c3486f5cb6bf1e7fb21995c (diff)
parent26d994357fa4dbcd813f1c066ce09d5fdaa301a9 (diff)
downloadandroid_frameworks_support-49c71910b7a13c6914fd57a682868e4fc1795e51.tar.gz
android_frameworks_support-49c71910b7a13c6914fd57a682868e4fc1795e51.tar.bz2
android_frameworks_support-49c71910b7a13c6914fd57a682868e4fc1795e51.zip
am 26d99435: Forward all MediaSession callbacks to MediaSessionCompat
* commit '26d994357fa4dbcd813f1c066ce09d5fdaa301a9': Forward all MediaSession callbacks to MediaSessionCompat
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 {