diff options
| author | RoboErik <epastern@google.com> | 2014-09-25 18:46:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-25 18:46:09 +0000 |
| commit | 96900279f59e1a082002b132be8c6c0c677923bf (patch) | |
| tree | e43dd35aa96190fbac1ad84d8dd4361c6e48449a /cmds | |
| parent | 2e579f299b72259eedeccbee7eceb98aff43cfcf (diff) | |
| parent | df26651ff45838ab8c2927178250a44a30bac4dd (diff) | |
| download | frameworks_base-96900279f59e1a082002b132be8c6c0c677923bf.zip frameworks_base-96900279f59e1a082002b132be8c6c0c677923bf.tar.gz frameworks_base-96900279f59e1a082002b132be8c6c0c677923bf.tar.bz2 | |
am 23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-dev
* commit '23df1c46b768bb2a1363b6f671b0d0c4879538b7':
Allow null queues to be set in MediaSession
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/media/src/com/android/commands/media/Media.java | 3 |
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 |