From 471b27bf105b24f3fcc7b17fe7156be2b49c3053 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 15 Nov 2021 11:19:57 +0000
Subject: [PATCH] Use buildUpon instead of creating new overrides in UI
 ControlView.

Creating a new set of overrides removes previously set overrides that
should be kept.

Issue: google/ExoPlayer#9690
PiperOrigin-RevId: 409933541
---
 .../main/java/androidx/media3/ui/StyledPlayerControlView.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/ui/src/main/java/androidx/media3/ui/StyledPlayerControlView.java b/libraries/ui/src/main/java/androidx/media3/ui/StyledPlayerControlView.java
index f7ac247886..11d1a3da24 100644
--- a/libraries/ui/src/main/java/androidx/media3/ui/StyledPlayerControlView.java
+++ b/libraries/ui/src/main/java/androidx/media3/ui/StyledPlayerControlView.java
@@ -2167,7 +2167,9 @@ public class StyledPlayerControlView extends FrameLayout {
               TrackSelectionParameters trackSelectionParameters =
                   player.getTrackSelectionParameters();
               TrackSelectionOverrides overrides =
-                  new TrackSelectionOverrides.Builder()
+                  trackSelectionParameters
+                      .trackSelectionOverrides
+                      .buildUpon()
                       .setOverrideForType(
                           new TrackSelectionOverride(
                               track.trackGroup, ImmutableList.of(track.trackIndex)))