From 7f1ee0b390fbf31d9d62f717dc69d10c825c2bbd Mon Sep 17 00:00:00 2001 From: tianyifeng Date: Fri, 18 Aug 2023 16:16:38 +0100 Subject: [PATCH] Use TrackGroup.equals when determining equality of BaseTrackSelection PiperOrigin-RevId: 558150684 --- .../media3/exoplayer/trackselection/BaseTrackSelection.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/trackselection/BaseTrackSelection.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/trackselection/BaseTrackSelection.java index 77e4a752b7..b346fe6cb3 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/trackselection/BaseTrackSelection.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/trackselection/BaseTrackSelection.java @@ -201,9 +201,7 @@ public abstract class BaseTrackSelection implements ExoTrackSelection { return hashCode; } - // Track groups are compared by identity not value, as distinct groups may have the same value. @Override - @SuppressWarnings({"ReferenceEquality", "EqualsGetClass"}) public boolean equals(@Nullable Object obj) { if (this == obj) { return true; @@ -212,6 +210,6 @@ public abstract class BaseTrackSelection implements ExoTrackSelection { return false; } BaseTrackSelection other = (BaseTrackSelection) obj; - return group == other.group && Arrays.equals(tracks, other.tracks); + return group.equals(other.group) && Arrays.equals(tracks, other.tracks); } }