loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove invalid command comparison

Browse Source 
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
This commit is contained in:
tonihei 2024-03-05 02:16:33 -08:00 committed by Copybara-Service
parent bbdaf2b092
commit c79ac5ba21
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/session/src/main/java/androidx/media3/session/CommandButton.java
View File

@ -651,10 +651,9 @@ public final class CommandButton implements Bundleable {
*/ */
/* package */ static boolean isEnabled( /* package */ static boolean isEnabled(
CommandButton button, SessionCommands sessionCommands, Player.Commands playerCommands) { CommandButton button, SessionCommands sessionCommands, Player.Commands playerCommands) {
return playerCommands.contains(button.playerCommand) return (button.sessionCommand != null && sessionCommands.contains(button.sessionCommand))
|| (button.sessionCommand != null && sessionCommands.contains(button.sessionCommand))
|| (button.playerCommand != Player.COMMAND_INVALID || (button.playerCommand != Player.COMMAND_INVALID
&& sessionCommands.contains(button.playerCommand)); && playerCommands.contains(button.playerCommand));
} }
// Bundleable implementation. // Bundleable implementation.

17
libraries/session/src/test/java/androidx/media3/session/CommandButtonTest.java
View File

@ -47,23 +47,6 @@ public class CommandButtonTest {
.isTrue(); .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 @Test
public void isEnabled_sessionCommandAvailableOrUnavailable_isEnabledCorrectly() { public void isEnabled_sessionCommandAvailableOrUnavailable_isEnabledCorrectly() {
SessionCommand command1 = new SessionCommand("command1", Bundle.EMPTY); SessionCommand command1 = new SessionCommand("command1", Bundle.EMPTY);