loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-17 04:29:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

annotate nullabilty of CommandReceiver

Browse Source 
Issue: #6938
PiperOrigin-RevId: 292415853
This commit is contained in:
bachinger 2020-01-30 21:44:55 +00:00 committed by Oliver Woodman
parent 0cc1eba757
commit ee2ad943d7
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
View File

@ -178,8 +178,8 @@ public final class MediaSessionConnector {
Player player, Player player,
ControlDispatcher controlDispatcher, ControlDispatcher controlDispatcher,
String command, String command,
Bundle extras, @Nullable Bundle extras,
ResultReceiver cb); @Nullable ResultReceiver cb);
} }
/** Interface to which playback preparation and play actions are delegated. */ /** 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. * @param player The player connected to the media session.
* @return The custom action to be included in the session playback state or {@code null}. * @return The custom action to be included in the session playback state or {@code null}.
*/ */
@Nullable
PlaybackStateCompat.CustomAction getCustomAction(Player player); PlaybackStateCompat.CustomAction getCustomAction(Player player);
} }
@ -1293,7 +1294,7 @@ public final class MediaSessionConnector {
} }
@Override @Override
public void onCommand(String command, Bundle extras, ResultReceiver cb) { public void onCommand(String command, @Nullable Bundle extras, @Nullable ResultReceiver cb) {
if (player != null) { if (player != null) {
for (int i = 0; i < commandReceivers.size(); i++) { for (int i = 0; i < commandReceivers.size(); i++) {
if (commandReceivers.get(i).onCommand(player, controlDispatcher, command, extras, cb)) { if (commandReceivers.get(i).onCommand(player, controlDispatcher, command, extras, cb)) {

6
extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
View File

@ -191,9 +191,9 @@ public final class TimelineQueueEditor
Player player, Player player,
ControlDispatcher controlDispatcher, ControlDispatcher controlDispatcher,
String command, String command,
Bundle extras, @Nullable Bundle extras,
ResultReceiver cb) { @Nullable ResultReceiver cb) {
if (!COMMAND_MOVE_QUEUE_ITEM.equals(command)) { if (!COMMAND_MOVE_QUEUE_ITEM.equals(command) || extras == null) {
return false; return false;
} }
int from = extras.getInt(EXTRA_FROM_INDEX, C.INDEX_UNSET); int from = extras.getInt(EXTRA_FROM_INDEX, C.INDEX_UNSET);

4
extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
View File

@ -186,8 +186,8 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
Player player, Player player,
ControlDispatcher controlDispatcher, ControlDispatcher controlDispatcher,
String command, String command,
Bundle extras, @Nullable Bundle extras,
ResultReceiver cb) { @Nullable ResultReceiver cb) {
return false; return false;
} }