From ed58280d239ad21f3ccfe34bbf846bf50578b403 Mon Sep 17 00:00:00 2001
From: Yoni Obadia <yobadia@hexaglobe.com>
Date: Thu, 27 Aug 2020 09:46:30 +0200
Subject: [PATCH] Review: Update according to review

---
 .../android/exoplayer2/ui/TrackSelectionDialogBuilder.java  | 6 ++----
 .../google/android/exoplayer2/ui/TrackSelectionView.java    | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java
index b9ae8888ae..ec8b3562a8 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java
@@ -62,7 +62,7 @@ public final class TrackSelectionDialogBuilder {
   @Nullable private TrackNameProvider trackNameProvider;
   private boolean isDisabled;
   private List<SelectionOverride> overrides;
-  private Comparator<Format> comparator;
+  @Nullable private Comparator<Format> comparator;
 
   /**
    * Creates a builder for a track selection dialog.
@@ -199,9 +199,7 @@ public final class TrackSelectionDialogBuilder {
   }
 
   public void setComparator(Comparator<Format> comparator) {
-    if(this.comparator != comparator) {
-      this.comparator = comparator;
-    }
+    this.comparator = comparator;
   }
 
   /**
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
index 210d394837..79fa172e18 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
@@ -202,6 +202,7 @@ public class TrackSelectionView extends LinearLayout {
    *     one override for each track group. If {@link #setAllowMultipleOverrides(boolean)} hasn't
    *     been set to {@code true}, only the first override is used.
    * @param listener An optional listener for track selection updates.
+   * @param comparator An optional comparator to order track selection
    */
   public void init(
       MappedTrackInfo mappedTrackInfo,
@@ -258,7 +259,7 @@ public class TrackSelectionView extends LinearLayout {
     defaultView.setEnabled(true);
 
     trackGroups = mappedTrackInfo.getTrackGroups(rendererIndex);
-    sortedTrackGroups = sortedTrackGroups != null ? sortedTrackGroups : initSortedTrackGroups(trackGroups);
+    sortedTrackGroups = initSortedTrackGroups(trackGroups);
 
     // Add per-track views.
     trackViews = new CheckedTextView[sortedTrackGroups.length][];
@@ -411,9 +412,8 @@ public class TrackSelectionView extends LinearLayout {
     int sortedTrackIndex = trackIndex;
     if(sortedTrackGroups != trackGroups) {
       Format selectedFormat = sortedTrackGroups.get(rendererIndex).getFormat(trackIndex);
-      int trackHash = selectedFormat.hashCode();
       for (int formatIndex = 0; formatIndex < trackGroups.get(groupIndex).length; formatIndex++) {
-        if(trackGroups.get(groupIndex).getFormat(formatIndex).hashCode() == trackHash) {
+        if(trackGroups.get(groupIndex).getFormat(formatIndex) == selectedFormat) {
           sortedTrackIndex = formatIndex;
           break;
         }