From 950ea910db9b93635707412b7bc0c627dc97cde7 Mon Sep 17 00:00:00 2001 From: ibaker Date: Wed, 19 Oct 2022 10:40:06 +0000 Subject: [PATCH] Remove ForwardingPlayer special case from PlayerControlView.setPlayer This was originally added in https://github.com/androidx/media/commit/4fd7d777b669f6adacc3737a7e15b04a57f030fb, but it hasn't done anything since https://github.com/androidx/media/commit/98ee159df161c7c8806c0b0490b642738822f6a7 (when the instanceof ExoPlayer check was removed). PiperOrigin-RevId: 482161662 (cherry picked from commit a5b09b8cccca80fb7c40a9576e029ef462b64582) --- .../src/main/java/androidx/media3/ui/PlayerControlView.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java b/libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java index a7e25b1767..8c56f78298 100644 --- a/libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java +++ b/libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java @@ -57,7 +57,6 @@ import androidx.annotation.Nullable; import androidx.core.content.res.ResourcesCompat; import androidx.media3.common.C; import androidx.media3.common.Format; -import androidx.media3.common.ForwardingPlayer; import androidx.media3.common.MediaLibraryInfo; import androidx.media3.common.Player; import androidx.media3.common.Player.Events; @@ -633,9 +632,6 @@ public class PlayerControlView extends FrameLayout { if (player != null) { player.addListener(componentListener); } - if (player instanceof ForwardingPlayer) { - player = ((ForwardingPlayer) player).getWrappedPlayer(); - } updateAll(); }