Make miscellaneous style changes in preparation for internal review

Author: AquilesCanta

RELEASENOTES.md

@@ -229,8 +229,7 @@ This release includes the following changes since [1.6.1](#161-2025-04-14):
         ([#2357](https://github.com/androidx/media/issues/2357)).
 *   Cast extension:
     *   Add support for `getDeviceVolume()`, `setDeviceVolume()`,
-        `increaseDeviceVolume()`, `decreaseDeviceVolume()`,
-        `isDeviceMuted()`, and `setDeviceMuted()`
+        `getDeviceMuted()`, and `setDeviceMuted()`
         ([#2089](https://github.com/androidx/media/issues/2089)).
 *   Test Utilities:
     *   Removed `transformer.TestUtil.addAudioDecoders(String...)`,

libraries/cast/src/main/java/androidx/media3/cast/CastPlayer.java

@@ -990,7 +990,7 @@ private void updateInternalStateAndNotifyIfChanged() {
             ? getCurrentTimeline().getPeriod(oldWindowIndex, period, /* setIds= */ true).uid
             : null;
     updatePlayerStateAndNotifyIfChanged(/* resultCallback= */ null);
-    updateVolumeAndNotifyIfChanged();
+    updateDeviceVolumeAndNotifyIfChanged();
     updateRepeatModeAndNotifyIfChanged(/* resultCallback= */ null);
     updateVolumeAndNotifyIfChanged(/* resultCallback= */ null);
     updatePlaybackRateAndNotifyIfChanged(/* resultCallback= */ null);
@@ -1101,21 +1101,13 @@ private void updatePlaybackRateAndNotifyIfChanged(@Nullable ResultCallback<?> re
   }
 
   @RequiresNonNull("castSession")
-  private void updateVolumeAndNotifyIfChanged() {
+  private void updateDeviceVolumeAndNotifyIfChanged() {
     if (castSession != null) {
       int deviceVolume = VOLUME_RANGE.clamp((int) Math.round(castSession.getVolume() * MAX_VOLUME));
       setDeviceVolumeAndNotifyIfChanged(deviceVolume, castSession.isMute());
     }
   }
 
-  @RequiresNonNull("remoteMediaClient")
-  private void updateRepeatModeAndNotifyIfChanged(@Nullable ResultCallback<?> resultCallback) {
-    if (repeatMode.acceptsUpdate(resultCallback)) {
-      setRepeatModeAndNotifyIfChanged(fetchRepeatMode(remoteMediaClient));
-      repeatMode.clearPendingResultCallback();
-    }
-  }
-
   @RequiresNonNull("remoteMediaClient")
   private void updateVolumeAndNotifyIfChanged(@Nullable ResultCallback<?> resultCallback) {
     if (volume.acceptsUpdate(resultCallback)) {
@@ -1124,6 +1116,14 @@ private void updateVolumeAndNotifyIfChanged(@Nullable ResultCallback<?> resultCa
     }
   }
 
+  @RequiresNonNull("remoteMediaClient")
+  private void updateRepeatModeAndNotifyIfChanged(@Nullable ResultCallback<?> resultCallback) {
+    if (repeatMode.acceptsUpdate(resultCallback)) {
+      setRepeatModeAndNotifyIfChanged(fetchRepeatMode(remoteMediaClient));
+      repeatMode.clearPendingResultCallback();
+    }
+  }
+
   /**
    * Updates the timeline and notifies {@link Player.Listener event listeners} if required.
    *
@@ -1527,7 +1527,6 @@ private static int fetchPlaybackState(RemoteMediaClient remoteMediaClient) {
   private static float fetchVolume(RemoteMediaClient remoteMediaClient) {
     MediaStatus mediaStatus = remoteMediaClient.getMediaStatus();
     if (mediaStatus == null) {
-      // No media session active, yet.
       return 1f;
     }
     return (float) mediaStatus.getStreamVolume();
@@ -1797,7 +1796,6 @@ public DeviceInfo fetchDeviceInfo() {
         // There's only one remote routing controller. It's safe to assume it's the Cast routing
         // controller.
         RoutingController remoteController = controllers.get(1);
-        // TODO b/364580007 - Populate min volume information.
         return new DeviceInfo.Builder(DeviceInfo.PLAYBACK_TYPE_REMOTE)
             .setMaxVolume(MAX_VOLUME)
             .setRoutingControllerId(remoteController.getId())
@@ -1836,7 +1834,7 @@ private final class CastListener extends Cast.Listener {
 
     @Override
     public void onVolumeChanged() {
-      updateVolumeAndNotifyIfChanged();
+      updateDeviceVolumeAndNotifyIfChanged();
       listeners.flushEvents();
     }
   }