From db25954dfd9db2819441bfbbadfce7dc0d336f04 Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Mon, 18 Jul 2022 10:36:01 +0000
Subject: [PATCH] Use the current overrides of the player as preset

Issue: google/ExoPlayer#10429
PiperOrigin-RevId: 461577039
(cherry picked from commit 5c2aabca660e7618ebe410d8ab7de95acc76ee1a)
---
 RELEASENOTES.md                                           | 3 +++
 .../androidx/media3/ui/TrackSelectionDialogBuilder.java   | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 97aed03d91..2419e6797a 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -37,6 +37,9 @@
     *   Ensure TalkBack announces the currently active speed option in the
         playback controls menu
         ([#10298](https://github.com/google/ExoPlayer/issues/10298)).
+    *   Use current overrides of the player as preset in
+        `TrackSelectionDialogBuilder`
+        ([#10429](https://github.com/google/ExoPlayer/issues/10429)).
 *   RTSP:
     *   Add RTP reader for H263
         ([#63](https://github.com/androidx/media/pull/63)).
diff --git a/libraries/ui/src/main/java/androidx/media3/ui/TrackSelectionDialogBuilder.java b/libraries/ui/src/main/java/androidx/media3/ui/TrackSelectionDialogBuilder.java
index 11cf8424ec..6cacef3ceb 100644
--- a/libraries/ui/src/main/java/androidx/media3/ui/TrackSelectionDialogBuilder.java
+++ b/libraries/ui/src/main/java/androidx/media3/ui/TrackSelectionDialogBuilder.java
@@ -67,7 +67,7 @@ public final class TrackSelectionDialogBuilder {
   private boolean showDisableOption;
   @Nullable private TrackNameProvider trackNameProvider;
   private boolean isDisabled;
-  private Map<TrackGroup, TrackSelectionOverride> overrides;
+  private ImmutableMap<TrackGroup, TrackSelectionOverride> overrides;
   @Nullable private Comparator<Format> trackFormatComparator;
 
   /**
@@ -87,7 +87,7 @@ public final class TrackSelectionDialogBuilder {
     this.title = title;
     this.trackGroups = ImmutableList.copyOf(trackGroups);
     this.callback = callback;
-    overrides = Collections.emptyMap();
+    overrides = ImmutableMap.of();
   }
 
   /**
@@ -110,7 +110,7 @@ public final class TrackSelectionDialogBuilder {
         trackGroups.add(trackGroup);
       }
     }
-    overrides = Collections.emptyMap();
+    overrides = player.getTrackSelectionParameters().overrides;
     callback =
         (isDisabled, overrides) -> {
           TrackSelectionParameters.Builder parametersBuilder =
@@ -171,7 +171,7 @@ public final class TrackSelectionDialogBuilder {
    */
   public TrackSelectionDialogBuilder setOverrides(
       Map<TrackGroup, TrackSelectionOverride> overrides) {
-    this.overrides = overrides;
+    this.overrides = ImmutableMap.copyOf(overrides);
     return this;
   }