From ee006ff2b55dfdc8e2d01a7b15d8b9b6155f453a Mon Sep 17 00:00:00 2001 From: tonihei Date: Wed, 10 Nov 2021 09:52:02 +0000 Subject: [PATCH] Add missing deprecation for old track selection override getters. The setters in the Builder are already deprecated and using the old getter is error-prone as they only return the overrides set with the deprecated setters. Issue: google/ExoPlayer#9665 PiperOrigin-RevId: 408817640 --- .../exoplayer2/trackselection/DefaultTrackSelector.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java index ea95d3afc7..5c9cdfa694 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java @@ -1009,7 +1009,11 @@ public class DefaultTrackSelector extends MappingTrackSelector { * @param rendererIndex The renderer index. * @param groups The {@link TrackGroupArray}. * @return Whether there is an override. + * @deprecated Only works to retrieve the overrides set with the deprecated {@link + * ParametersBuilder#setSelectionOverride(int, TrackGroupArray, SelectionOverride)}. Use + * {@link TrackSelectionParameters#trackSelectionOverrides} instead. */ + @Deprecated public final boolean hasSelectionOverride(int rendererIndex, TrackGroupArray groups) { Map overrides = selectionOverrides.get(rendererIndex); @@ -1022,7 +1026,11 @@ public class DefaultTrackSelector extends MappingTrackSelector { * @param rendererIndex The renderer index. * @param groups The {@link TrackGroupArray}. * @return The override, or null if no override exists. + * @deprecated Only works to retrieve the overrides set with the deprecated {@link + * ParametersBuilder#setSelectionOverride(int, TrackGroupArray, SelectionOverride)}. Use + * {@link TrackSelectionParameters#trackSelectionOverrides} instead. */ + @Deprecated @Nullable public final SelectionOverride getSelectionOverride(int rendererIndex, TrackGroupArray groups) { Map overrides =