diff options
author | RoboErik <epastern@google.com> | 2014-09-24 09:46:57 -0700 |
---|---|---|
committer | RoboErik <epastern@google.com> | 2014-09-24 14:35:32 -0700 |
commit | 03fce072cac092923e10a6b5f09fcde333375f9e (patch) | |
tree | 128bdd32a0001add7f2804af68231fedcae4dc3e /tests/OneMedia | |
parent | 23b113592a5f461ec66026cbf8bce253cb8d3a46 (diff) | |
download | frameworks_base-03fce072cac092923e10a6b5f09fcde333375f9e.zip frameworks_base-03fce072cac092923e10a6b5f09fcde333375f9e.tar.gz frameworks_base-03fce072cac092923e10a6b5f09fcde333375f9e.tar.bz2 |
Allow null queues to be set in MediaSession
Also add some test code for it to OneMedia.
bug:17593962
Change-Id: I074e2bb0329d9a97f623e4309bb7dada157b8324
Diffstat (limited to 'tests/OneMedia')
-rw-r--r-- | tests/OneMedia/src/com/android/onemedia/PlayerSession.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/OneMedia/src/com/android/onemedia/PlayerSession.java b/tests/OneMedia/src/com/android/onemedia/PlayerSession.java index 8b7c883..2455c9c 100644 --- a/tests/OneMedia/src/com/android/onemedia/PlayerSession.java +++ b/tests/OneMedia/src/com/android/onemedia/PlayerSession.java @@ -20,6 +20,7 @@ import android.content.Intent; import android.graphics.Bitmap; import android.media.MediaMetadata; import android.media.session.MediaSession; +import android.media.session.MediaSession.QueueItem; import android.media.session.MediaSessionManager; import android.media.session.PlaybackState; import android.os.Bundle; @@ -44,6 +45,8 @@ public class PlayerSession { protected MediaSession.Callback mCallback; protected Renderer.Listener mRenderListener; protected MediaMetadata.Builder mMetadataBuilder; + protected ArrayList<MediaSession.QueueItem> mQueue; + protected boolean mUseQueue; protected PlaybackState mPlaybackState; protected Listener mListener; @@ -58,6 +61,7 @@ public class PlayerSession { PlaybackState.Builder psBob = new PlaybackState.Builder(); psBob.setActions(PlaybackState.ACTION_PAUSE | PlaybackState.ACTION_PLAY); mPlaybackState = psBob.build(); + mQueue = new ArrayList<MediaSession.QueueItem>(); mRenderer.registerListener(mRenderListener); @@ -114,6 +118,8 @@ public class PlayerSession { public void setIcon(Bitmap icon) { mMetadataBuilder.putBitmap(MediaMetadata.METADATA_KEY_DISPLAY_ICON, icon); + mQueue.clear(); + mQueue.add(new QueueItem(mMetadataBuilder.build().getDescription(), 11)); updateMetadata(); } @@ -122,6 +128,10 @@ public class PlayerSession { // code if (mSession != null && mSession.isActive()) { mSession.setMetadata(mMetadataBuilder.build()); + // Just toggle the queue every time we update for testing + mSession.setQueue(mUseQueue ? mQueue : null); + mSession.setQueueTitle(mUseQueue ? "Queue title" : null); + mUseQueue = !mUseQueue; } } @@ -141,6 +151,8 @@ public class PlayerSession { "OneMedia display title"); mMetadataBuilder.putString(MediaMetadata.METADATA_KEY_DISPLAY_SUBTITLE, "OneMedia display subtitle"); + + mQueue.add(new QueueItem(mMetadataBuilder.build().getDescription(), 11)); } public interface Listener { |