diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java index cf7d69eb29..04c821565d 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java @@ -54,10 +54,8 @@ import com.google.android.exoplayer2.metadata.MetadataOutput; import com.google.android.exoplayer2.source.LoadEventInfo; import com.google.android.exoplayer2.source.MediaLoadData; import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId; -import com.google.android.exoplayer2.source.TrackGroupArray; import com.google.android.exoplayer2.text.Cue; import com.google.android.exoplayer2.trackselection.TrackSelection; -import com.google.android.exoplayer2.trackselection.TrackSelectionArray; import com.google.android.exoplayer2.trackselection.TrackSelectionParameters; import com.google.android.exoplayer2.util.FlagSet; import com.google.android.exoplayer2.video.VideoDecoderOutputBufferRenderer; @@ -238,10 +236,7 @@ public interface AnalyticsListener { * {@link Player#getCurrentMediaItem()} changed or the player started repeating the current item. */ int EVENT_MEDIA_ITEM_TRANSITION = Player.EVENT_MEDIA_ITEM_TRANSITION; - /** - * {@link Player#getCurrentTracksInfo()}, {@link Player#getCurrentTrackGroups()} or {@link - * Player#getCurrentTrackSelections()} changed. - */ + /** {@link Player#getCurrentTracksInfo()} changed. */ int EVENT_TRACKS_CHANGED = Player.EVENT_TRACKS_CHANGED; /** {@link Player#isLoading()} ()} changed. */ int EVENT_IS_LOADING_CHANGED = Player.EVENT_IS_LOADING_CHANGED; @@ -706,18 +701,6 @@ public interface AnalyticsListener { */ default void onPlayerErrorChanged(EventTime eventTime, @Nullable PlaybackException error) {} - /** - * Called when the available or selected tracks for the renderers changed. - * - * @param eventTime The event time. - * @param trackGroups The available tracks. May be empty. - * @param trackSelections The track selections for each renderer. May contain null elements. - * @deprecated Use {@link #onTracksInfoChanged}. - */ - @Deprecated - default void onTracksChanged( - EventTime eventTime, TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {} - /** * Called when the available or selected tracks change. * diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/DefaultAnalyticsCollector.java b/library/core/src/main/java/com/google/android/exoplayer2/analytics/DefaultAnalyticsCollector.java index f277c1a165..f8d78a32db 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/analytics/DefaultAnalyticsCollector.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/DefaultAnalyticsCollector.java @@ -482,15 +482,11 @@ public class DefaultAnalyticsCollector implements AnalyticsCollector { listener -> listener.onMediaItemTransition(eventTime, mediaItem, reason)); } + @SuppressWarnings("deprecation") // Implementing deprecated method. @Override - @SuppressWarnings("deprecation") // Implementing and calling deprecate listener method public final void onTracksChanged( TrackGroupArray trackGroups, TrackSelectionArray trackSelections) { - EventTime eventTime = generateCurrentPlayerMediaPeriodEventTime(); - sendEvent( - eventTime, - AnalyticsListener.EVENT_TRACKS_CHANGED, - listener -> listener.onTracksChanged(eventTime, trackGroups, trackSelections)); + // Do nothing. Handled by non-deprecated onTracksInfoChanged. } @Override diff --git a/library/core/src/test/java/com/google/android/exoplayer2/analytics/DefaultAnalyticsCollectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/analytics/DefaultAnalyticsCollectorTest.java index f00e2a019a..e545e0c50e 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/analytics/DefaultAnalyticsCollectorTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/analytics/DefaultAnalyticsCollectorTest.java @@ -1721,7 +1721,7 @@ public final class DefaultAnalyticsCollectorTest { ArgumentCaptor individualTracksChangedEventTimes = ArgumentCaptor.forClass(AnalyticsListener.EventTime.class); verify(listener, atLeastOnce()) - .onTracksChanged(individualTracksChangedEventTimes.capture(), any(), any()); + .onTracksInfoChanged(individualTracksChangedEventTimes.capture(), any()); ArgumentCaptor individualPlayWhenReadyChangedEventTimes = ArgumentCaptor.forClass(AnalyticsListener.EventTime.class); verify(listener, atLeastOnce())