From cfcce9aec9d92a7067f07b2d9c00d705df0368ac Mon Sep 17 00:00:00 2001 From: tonihei Date: Mon, 16 Jan 2023 12:50:20 +0000 Subject: [PATCH] Fix command check in MediaControllerImplBase The command check for setDeviceMuted was wrong. PiperOrigin-RevId: 502355332 --- .../java/androidx/media3/session/MediaControllerImplBase.java | 2 +- .../main/java/androidx/media3/session/MediaSessionStub.java | 2 +- .../androidx/media3/session/MediaSessionPermissionTest.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplBase.java b/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplBase.java index c16a8a61d8..8cca5c4d87 100644 --- a/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplBase.java +++ b/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplBase.java @@ -1468,7 +1468,7 @@ import org.checkerframework.checker.nullness.qual.NonNull; @Override public void setDeviceMuted(boolean muted) { - if (!isPlayerCommandAvailable(Player.COMMAND_SET_DEVICE_VOLUME)) { + if (!isPlayerCommandAvailable(Player.COMMAND_ADJUST_DEVICE_VOLUME)) { return; } diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaSessionStub.java b/libraries/session/src/main/java/androidx/media3/session/MediaSessionStub.java index 866e92d80e..aa51cb519c 100644 --- a/libraries/session/src/main/java/androidx/media3/session/MediaSessionStub.java +++ b/libraries/session/src/main/java/androidx/media3/session/MediaSessionStub.java @@ -1324,7 +1324,7 @@ import java.util.concurrent.ExecutionException; queueSessionTaskWithPlayerCommand( caller, sequenceNumber, - COMMAND_SET_DEVICE_VOLUME, + COMMAND_ADJUST_DEVICE_VOLUME, sendSessionResultSuccess(player -> player.setDeviceMuted(muted))); } diff --git a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionPermissionTest.java b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionPermissionTest.java index d19743b6ee..38492052ef 100644 --- a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionPermissionTest.java +++ b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionPermissionTest.java @@ -185,7 +185,8 @@ public class MediaSessionPermissionTest { @Test public void setDeviceMuted() throws Exception { - testOnCommandRequest(COMMAND_SET_DEVICE_VOLUME, controller -> controller.setDeviceMuted(true)); + testOnCommandRequest( + COMMAND_ADJUST_DEVICE_VOLUME, controller -> controller.setDeviceMuted(true)); } @Test