From eefb37a0bad3122b0bedf2792f7d67f05ec505c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= <m.gaetan89@gmail.com>
Date: Mon, 15 Jul 2024 15:01:40 +0200
Subject: [PATCH] Simplify `VolumeProviderCompat.getVolumeProvider()`

---
 .../androidx/media3/session/legacy/MediaSessionCompat.java   | 3 +--
 .../androidx/media3/session/legacy/VolumeProviderCompat.java | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/libraries/session/src/main/java/androidx/media3/session/legacy/MediaSessionCompat.java b/libraries/session/src/main/java/androidx/media3/session/legacy/MediaSessionCompat.java
index 7a6fa19709..f09a3bb4b8 100644
--- a/libraries/session/src/main/java/androidx/media3/session/legacy/MediaSessionCompat.java
+++ b/libraries/session/src/main/java/androidx/media3/session/legacy/MediaSessionCompat.java
@@ -34,7 +34,6 @@ import android.media.AudioManager;
 import android.media.MediaDescription;
 import android.media.MediaMetadata;
 import android.media.Rating;
-import android.media.VolumeProvider;
 import android.media.session.MediaSession;
 import android.media.session.PlaybackState;
 import android.net.Uri;
@@ -2277,7 +2276,7 @@ public class MediaSessionCompat {
 
     @Override
     public void setPlaybackToRemote(VolumeProviderCompat volumeProvider) {
-      mSessionFwk.setPlaybackToRemote((VolumeProvider) volumeProvider.getVolumeProvider());
+      mSessionFwk.setPlaybackToRemote(volumeProvider.getVolumeProvider());
     }
 
     @Override
diff --git a/libraries/session/src/main/java/androidx/media3/session/legacy/VolumeProviderCompat.java b/libraries/session/src/main/java/androidx/media3/session/legacy/VolumeProviderCompat.java
index 16ff00f23a..4c72becbd0 100644
--- a/libraries/session/src/main/java/androidx/media3/session/legacy/VolumeProviderCompat.java
+++ b/libraries/session/src/main/java/androidx/media3/session/legacy/VolumeProviderCompat.java
@@ -129,8 +129,7 @@ public abstract class VolumeProviderCompat {
    */
   public final void setCurrentVolume(int currentVolume) {
     mCurrentVolume = currentVolume;
-    VolumeProvider volumeProviderFwk = (VolumeProvider) getVolumeProvider();
-    volumeProviderFwk.setCurrentVolume(currentVolume);
+    getVolumeProvider().setCurrentVolume(currentVolume);
   }
 
   /**
@@ -163,7 +162,7 @@ public abstract class VolumeProviderCompat {
    *
    * @return An equivalent {@link android.media.VolumeProvider} object, or null if none.
    */
-  public Object getVolumeProvider() {
+  public VolumeProvider getVolumeProvider() {
     if (mVolumeProviderFwk == null) {
       if (Build.VERSION.SDK_INT >= 30) {
         mVolumeProviderFwk =