From 672d149a73bfe2acce78e87e6e2c23f1fc4458ab Mon Sep 17 00:00:00 2001 From: tonihei Date: Tue, 5 Mar 2024 02:16:33 -0800 Subject: [PATCH] Remove invalid command comparison The removed check searched for a player command inside a list of session commands, which is not allowed by the IntDef definition and only worked because both types map to a Java int. PiperOrigin-RevId: 612758442 (cherry picked from commit c79ac5ba218c685ea6cf284a634899c8327785c8) --- .../androidx/media3/session/CommandButton.java | 5 ++--- .../media3/session/CommandButtonTest.java | 17 ----------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/libraries/session/src/main/java/androidx/media3/session/CommandButton.java b/libraries/session/src/main/java/androidx/media3/session/CommandButton.java index 1ec624c2f4..ed3c7e72fc 100644 --- a/libraries/session/src/main/java/androidx/media3/session/CommandButton.java +++ b/libraries/session/src/main/java/androidx/media3/session/CommandButton.java @@ -292,10 +292,9 @@ public final class CommandButton implements Bundleable { */ /* package */ static boolean isEnabled( CommandButton button, SessionCommands sessionCommands, Player.Commands playerCommands) { - return playerCommands.contains(button.playerCommand) - || (button.sessionCommand != null && sessionCommands.contains(button.sessionCommand)) + return (button.sessionCommand != null && sessionCommands.contains(button.sessionCommand)) || (button.playerCommand != Player.COMMAND_INVALID - && sessionCommands.contains(button.playerCommand)); + && playerCommands.contains(button.playerCommand)); } // Bundleable implementation. diff --git a/libraries/session/src/test/java/androidx/media3/session/CommandButtonTest.java b/libraries/session/src/test/java/androidx/media3/session/CommandButtonTest.java index fc2632f70e..70240e6159 100644 --- a/libraries/session/src/test/java/androidx/media3/session/CommandButtonTest.java +++ b/libraries/session/src/test/java/androidx/media3/session/CommandButtonTest.java @@ -47,23 +47,6 @@ public class CommandButtonTest { .isTrue(); } - @Test - public void isEnabled_playerCommandAvailableOrUnavailableInSessionCommands_isEnabledCorrectly() { - CommandButton button = - new CommandButton.Builder() - .setDisplayName("button") - .setIconResId(R.drawable.media3_notification_small_icon) - .setPlayerCommand(Player.COMMAND_SEEK_TO_NEXT) - .build(); - SessionCommands availableSessionCommands = - SessionCommands.EMPTY.buildUpon().add(Player.COMMAND_SEEK_TO_NEXT).build(); - - assertThat(CommandButton.isEnabled(button, SessionCommands.EMPTY, Player.Commands.EMPTY)) - .isFalse(); - assertThat(CommandButton.isEnabled(button, availableSessionCommands, Player.Commands.EMPTY)) - .isTrue(); - } - @Test public void isEnabled_sessionCommandAvailableOrUnavailable_isEnabledCorrectly() { SessionCommand command1 = new SessionCommand("command1", Bundle.EMPTY);