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

Simplify VolumeProviderCompat.getVolumeProvider()

Browse Source
This commit is contained in:
Gaëtan Muller 2024-07-15 15:01:40 +02:00 committed by Ian Baker
parent 0593b36dad
commit eefb37a0ba
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/session/src/main/java/androidx/media3/session/legacy/MediaSessionCompat.java
View File

@ -34,7 +34,6 @@ import android.media.AudioManager;
import android.media.MediaDescription; import android.media.MediaDescription;
import android.media.MediaMetadata; import android.media.MediaMetadata;
import android.media.Rating; import android.media.Rating;
import android.media.VolumeProvider;
import android.media.session.MediaSession; import android.media.session.MediaSession;
import android.media.session.PlaybackState; import android.media.session.PlaybackState;
import android.net.Uri; import android.net.Uri;
@ -2277,7 +2276,7 @@ public class MediaSessionCompat {
@Override @Override
public void setPlaybackToRemote(VolumeProviderCompat volumeProvider) { public void setPlaybackToRemote(VolumeProviderCompat volumeProvider) {
mSessionFwk.setPlaybackToRemote((VolumeProvider) volumeProvider.getVolumeProvider()); mSessionFwk.setPlaybackToRemote(volumeProvider.getVolumeProvider());
} }
@Override @Override

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

@ -129,8 +129,7 @@ public abstract class VolumeProviderCompat {
*/ */
public final void setCurrentVolume(int currentVolume) { public final void setCurrentVolume(int currentVolume) {
mCurrentVolume = currentVolume; mCurrentVolume = currentVolume;
VolumeProvider volumeProviderFwk = (VolumeProvider) getVolumeProvider(); getVolumeProvider().setCurrentVolume(currentVolume);
volumeProviderFwk.setCurrentVolume(currentVolume);
} }
/** /**
@ -163,7 +162,7 @@ public abstract class VolumeProviderCompat {
* *
* @return An equivalent {@link android.media.VolumeProvider} object, or null if none. * @return An equivalent {@link android.media.VolumeProvider} object, or null if none.
*/ */
public Object getVolumeProvider() { public VolumeProvider getVolumeProvider() {
if (mVolumeProviderFwk == null) { if (mVolumeProviderFwk == null) {
if (Build.VERSION.SDK_INT >= 30) { if (Build.VERSION.SDK_INT >= 30) {
mVolumeProviderFwk = mVolumeProviderFwk =