summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorRoboErik <epastern@google.com>2014-09-25 18:28:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-25 18:28:21 +0000
commitdf26651ff45838ab8c2927178250a44a30bac4dd (patch)
tree557b0cba0839928ea9c29097a3206f91c2a22494 /cmds
parent864a8b667a5f15f60dd0fe0628f536f1cb175756 (diff)
parent03fce072cac092923e10a6b5f09fcde333375f9e (diff)
downloadframeworks_base-df26651ff45838ab8c2927178250a44a30bac4dd.zip
frameworks_base-df26651ff45838ab8c2927178250a44a30bac4dd.tar.gz
frameworks_base-df26651ff45838ab8c2927178250a44a30bac4dd.tar.bz2
Merge "Allow null queues to be set in MediaSession" into lmp-dev
Diffstat (limited to 'cmds')
-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