From ee2ad943d78e4fbb6508c92fece43401373dc4e3 Mon Sep 17 00:00:00 2001 From: bachinger Date: Thu, 30 Jan 2020 21:44:55 +0000 Subject: [PATCH] annotate nullabilty of CommandReceiver Issue: #6938 PiperOrigin-RevId: 292415853 --- .../exoplayer2/ext/mediasession/MediaSessionConnector.java | 7 ++++--- .../exoplayer2/ext/mediasession/TimelineQueueEditor.java | 6 +++--- .../ext/mediasession/TimelineQueueNavigator.java | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java index 5382e286a1..41a2071827 100644 --- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java +++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java @@ -178,8 +178,8 @@ public final class MediaSessionConnector { Player player, ControlDispatcher controlDispatcher, String command, - Bundle extras, - ResultReceiver cb); + @Nullable Bundle extras, + @Nullable ResultReceiver cb); } /** Interface to which playback preparation and play actions are delegated. */ @@ -394,6 +394,7 @@ public final class MediaSessionConnector { * @param player The player connected to the media session. * @return The custom action to be included in the session playback state or {@code null}. */ + @Nullable PlaybackStateCompat.CustomAction getCustomAction(Player player); } @@ -1293,7 +1294,7 @@ public final class MediaSessionConnector { } @Override - public void onCommand(String command, Bundle extras, ResultReceiver cb) { + public void onCommand(String command, @Nullable Bundle extras, @Nullable ResultReceiver cb) { if (player != null) { for (int i = 0; i < commandReceivers.size(); i++) { if (commandReceivers.get(i).onCommand(player, controlDispatcher, command, extras, cb)) { diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java index 41bda3bf44..7f60d5e715 100644 --- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java +++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java @@ -191,9 +191,9 @@ public final class TimelineQueueEditor Player player, ControlDispatcher controlDispatcher, String command, - Bundle extras, - ResultReceiver cb) { - if (!COMMAND_MOVE_QUEUE_ITEM.equals(command)) { + @Nullable Bundle extras, + @Nullable ResultReceiver cb) { + if (!COMMAND_MOVE_QUEUE_ITEM.equals(command) || extras == null) { return false; } int from = extras.getInt(EXTRA_FROM_INDEX, C.INDEX_UNSET); diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java index fc4cc11b58..f9d0eca353 100644 --- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java +++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java @@ -186,8 +186,8 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu Player player, ControlDispatcher controlDispatcher, String command, - Bundle extras, - ResultReceiver cb) { + @Nullable Bundle extras, + @Nullable ResultReceiver cb) { return false; }