summaryrefslogtreecommitdiffstats
path: root/cmds/media/src
diff options
context:
space:
mode:
authorRoboErik <epastern@google.com>2014-09-24 09:46:57 -0700
committerRoboErik <epastern@google.com>2014-09-24 14:35:32 -0700
commit03fce072cac092923e10a6b5f09fcde333375f9e (patch)
tree128bdd32a0001add7f2804af68231fedcae4dc3e /cmds/media/src
parent23b113592a5f461ec66026cbf8bce253cb8d3a46 (diff)
downloadframeworks_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 'cmds/media/src')
-rw-r--r--cmds/media/src/com/android/commands/media/Media.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmds/media/src/com/android/commands/media/Media.java b/cmds/media/src/com/android/commands/media/Media.java
index b37f896..6a8fb05 100644
--- a/cmds/media/src/com/android/commands/media/Media.java
+++ b/cmds/media/src/com/android/commands/media/Media.java
@@ -204,7 +204,8 @@ public class Media extends BaseCommand {
@Override
public void onQueueChanged(ParceledListSlice queue) throws RemoteException {
- System.out.println("onQueueChanged, size=" + queue.getList().size());
+ System.out.println("onQueueChanged, "
+ + (queue == null ? "null queue" : " size=" + queue.getList().size()));
}
@Override