Remove deprecated MediaSource.getTag

PiperOrigin-RevId: 373222158

RELEASENOTES.md

@@ -8,7 +8,7 @@
 *   Remove deprecated symbols:
     *   Remove `Player.getPlaybackError`. Use `Player.getPlayerError` instead.
     *   Remove `Player.getCurrentTag`. Use `Player.getCurrentMediaItem` and
-        `MediaIteam.PlaybackProperties.tag` instead.
+        `MediaItem.PlaybackProperties.tag` instead.
     *   Remove `PlaybackPreparer`. UI components that previously had
         `setPlaybackPreparer` methods will now call `Player.prepare` by default.
         If this behavior is sufficient, use of `PlaybackPreparer` can be removed
@@ -33,6 +33,8 @@
     *   Remove `Format.create` methods. Use `Format.Builder` instead.
     *   Remove `Timeline.getWindow(int, Window, boolean)`. Use
         `Timeline.getWindow(int, Window)` instead, which will always set tags.
+    *   Remove `MediaSource.getTag`. Use `MediaSource.getMediaItem` and
+        `MediaItem.PlaybackProperties.tag` instead.
     *   Remove `CastPlayer` specific playlist manipulation methods. Use
         `setMediaItems`, `addMediaItems`, `removeMediaItem` and `moveMediaItem`
         instead.

library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java

@@ -186,17 +186,6 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> {
     window = new Timeline.Window();
   }
 
-  /**
-   * @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
-   */
-  @SuppressWarnings("deprecation")
-  @Deprecated
-  @Override
-  @Nullable
-  public Object getTag() {
-    return mediaSource.getTag();
-  }
-
   @Override
   public MediaItem getMediaItem() {
     return mediaSource.getMediaItem();

library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java

@@ -72,17 +72,6 @@ public final class LoopingMediaSource extends CompositeMediaSource<Void> {
     mediaPeriodToChildMediaPeriodId = new HashMap<>();
   }
 
-  /**
-   * @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
-   */
-  @SuppressWarnings("deprecation")
-  @Deprecated
-  @Override
-  @Nullable
-  public Object getTag() {
-    return maskingMediaSource.getTag();
-  }
-
   @Override
   public MediaItem getMediaItem() {
     return maskingMediaSource.getMediaItem();

library/core/src/main/java/com/google/android/exoplayer2/source/MaskingMediaSource.java

@@ -86,17 +86,6 @@ public final class MaskingMediaSource extends CompositeMediaSource<Void> {
     }
   }
 
-  /**
-   * @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
-   */
-  @SuppressWarnings("deprecation")
-  @Deprecated
-  @Override
-  @Nullable
-  public Object getTag() {
-    return mediaSource.getTag();
-  }
-
   @Override
   public MediaItem getMediaItem() {
     return mediaSource.getMediaItem();

library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java

@@ -180,15 +180,6 @@ public interface MediaSource {
     return true;
   }
 
-  /**
-   * @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
-   */
-  @Deprecated
-  @Nullable
-  default Object getTag() {
-    return null;
-  }
-
   /** Returns the {@link MediaItem} whose media is provided by the source. */
   MediaItem getMediaItem();
 

library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java

@@ -154,17 +154,6 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> {
     clippedMediaPeriods = MultimapBuilder.hashKeys().arrayListValues().build();
   }
 
-  /**
-   * @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
-   */
-  @SuppressWarnings("deprecation")
-  @Deprecated
-  @Override
-  @Nullable
-  public Object getTag() {
-    return mediaSources.length > 0 ? mediaSources[0].getTag() : null;
-  }
-
   @Override
   public MediaItem getMediaItem() {
     return mediaSources.length > 0 ? mediaSources[0].getMediaItem() : EMPTY_MEDIA_ITEM;

library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java

@@ -283,17 +283,6 @@ public final class ProgressiveMediaSource extends BaseMediaSource
     this.timelineDurationUs = C.TIME_UNSET;
   }
 
-  /**
-   * @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
-   */
-  @SuppressWarnings("deprecation")
-  @Deprecated
-  @Override
-  @Nullable
-  public Object getTag() {
-    return playbackProperties.tag;
-  }
-
   @Override
   public MediaItem getMediaItem() {
     return mediaItem;

library/core/src/main/java/com/google/android/exoplayer2/source/SilenceMediaSource.java

@@ -148,17 +148,6 @@ public final class SilenceMediaSource extends BaseMediaSource {
   @Override
   public void releasePeriod(MediaPeriod mediaPeriod) {}
 
-  /**
-   * @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
-   */
-  @SuppressWarnings("deprecation")
-  @Deprecated
-  @Nullable
-  @Override
-  public Object getTag() {
-    return Assertions.checkNotNull(mediaItem.playbackProperties).tag;
-  }
-
   @Override
   public MediaItem getMediaItem() {
     return mediaItem;

library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java

@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.source;
 
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
-import static com.google.android.exoplayer2.util.Util.castNonNull;
 
 import android.net.Uri;
 import androidx.annotation.Nullable;
@@ -198,17 +197,6 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
 
   // MediaSource implementation.
 
-  /**
-   * @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
-   */
-  @SuppressWarnings("deprecation")
-  @Deprecated
-  @Override
-  @Nullable
-  public Object getTag() {
-    return castNonNull(mediaItem.playbackProperties).tag;
-  }
-
   @Override
   public MediaItem getMediaItem() {
     return mediaItem;

library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java

@@ -174,17 +174,6 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
     adsLoader.setSupportedContentTypes(adMediaSourceFactory.getSupportedTypes());
   }
 
-  /**
-   * @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
-   */
-  @SuppressWarnings("deprecation")
-  @Deprecated
-  @Override
-  @Nullable
-  public Object getTag() {
-    return contentMediaSource.getTag();
-  }
-
   @Override
   public MediaItem getMediaItem() {
     return contentMediaSource.getMediaItem();

library/core/src/test/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactoryTest.java

@@ -29,7 +29,6 @@ import com.google.android.exoplayer2.source.ads.AdsMediaSource;
 import com.google.android.exoplayer2.ui.AdViewProvider;
 import com.google.android.exoplayer2.util.MimeTypes;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -63,19 +62,6 @@ public final class DefaultMediaSourceFactoryTest {
     assertThat(mediaSource).isInstanceOf(ProgressiveMediaSource.class);
   }
 
-  @Test
-  @SuppressWarnings("deprecation") // Testing deprecated MediaSource.getTag() still works.
-  public void createMediaSource_withTag_tagInSource_deprecated() {
-    Object tag = new Object();
-    DefaultMediaSourceFactory defaultMediaSourceFactory =
-        new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext());
-    MediaItem mediaItem = new MediaItem.Builder().setUri(URI_MEDIA).setTag(tag).build();
-
-    MediaSource mediaSource = defaultMediaSourceFactory.createMediaSource(mediaItem);
-
-    assertThat(mediaSource.getTag()).isEqualTo(tag);
-  }
-
   @Test
   public void createMediaSource_withPath_progressiveSource() {
     DefaultMediaSourceFactory defaultMediaSourceFactory =
@@ -119,26 +105,6 @@ public final class DefaultMediaSourceFactoryTest {
     assertThat(mediaSource).isInstanceOf(MergingMediaSource.class);
   }
 
-  @Test
-  @SuppressWarnings("deprecation") // Testing deprecated MediaSource.getTag() still works.
-  public void createMediaSource_withSubtitle_hasTag_deprecated() {
-    DefaultMediaSourceFactory defaultMediaSourceFactory =
-        new DefaultMediaSourceFactory((Context) ApplicationProvider.getApplicationContext());
-    Object tag = new Object();
-    MediaItem mediaItem =
-        new MediaItem.Builder()
-            .setTag(tag)
-            .setUri(URI_MEDIA)
-            .setSubtitles(
-                Collections.singletonList(
-                    new MediaItem.Subtitle(Uri.parse(URI_TEXT), MimeTypes.APPLICATION_TTML, "en")))
-            .build();
-
-    MediaSource mediaSource = defaultMediaSourceFactory.createMediaSource(mediaItem);
-
-    assertThat(mediaSource.getTag()).isEqualTo(tag);
-  }
-
   @Test
   public void createMediaSource_withStartPosition_isClippingMediaSource() {
     DefaultMediaSourceFactory defaultMediaSourceFactory =

library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java

@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.source.dash;
 
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static com.google.android.exoplayer2.util.Assertions.checkState;
-import static com.google.android.exoplayer2.util.Util.castNonNull;
 import static java.lang.Math.max;
 import static java.lang.Math.min;
 
@@ -538,17 +537,6 @@ public final class DashMediaSource extends BaseMediaSource {
 
   // MediaSource implementation.
 
-  /**
-   * @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
-   */
-  @SuppressWarnings("deprecation")
-  @Deprecated
-  @Override
-  @Nullable
-  public Object getTag() {
-    return castNonNull(mediaItem.playbackProperties).tag;
-  }
-
   @Override
   public MediaItem getMediaItem() {
     return mediaItem;

library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaSourceTest.java

@@ -21,7 +21,6 @@ import static org.junit.Assert.fail;
 import static org.robolectric.annotation.LooperMode.Mode.PAUSED;
 
 import android.net.Uri;
-import androidx.annotation.Nullable;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
@@ -138,35 +137,6 @@ public final class DashMediaSourceTest {
     assertThat(dashMediaItem.playbackProperties.tag).isEqualTo(mediaItemTag);
   }
 
-  // Tests backwards compatibility
-  @SuppressWarnings("deprecation")
-  @Test
-  public void factorySetTag_setsDeprecatedMediaSourceTag() {
-    Object tag = new Object();
-    MediaItem mediaItem = MediaItem.fromUri("http://www.google.com");
-    DashMediaSource.Factory factory =
-        new DashMediaSource.Factory(new FileDataSource.Factory()).setTag(tag);
-
-    @Nullable Object mediaSourceTag = factory.createMediaSource(mediaItem).getTag();
-
-    assertThat(mediaSourceTag).isEqualTo(tag);
-  }
-
-  // Tests backwards compatibility
-  @SuppressWarnings("deprecation")
-  @Test
-  public void factoryCreateMediaSource_setsDeprecatedMediaSourceTag() {
-    Object tag = new Object();
-    MediaItem mediaItem =
-        new MediaItem.Builder().setUri("http://www.google.com").setTag(tag).build();
-    DashMediaSource.Factory factory =
-        new DashMediaSource.Factory(new FileDataSource.Factory()).setTag(new Object());
-
-    @Nullable Object mediaSourceTag = factory.createMediaSource(mediaItem).getTag();
-
-    assertThat(mediaSourceTag).isEqualTo(tag);
-  }
-
   // Tests backwards compatibility
   @SuppressWarnings("deprecation")
   @Test

library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java

@@ -451,17 +451,6 @@ public final class HlsMediaSource extends BaseMediaSource
     this.useSessionKeys = useSessionKeys;
   }
 
-  /**
-   * @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
-   */
-  @SuppressWarnings("deprecation")
-  @Deprecated
-  @Override
-  @Nullable
-  public Object getTag() {
-    return playbackProperties.tag;
-  }
-
   @Override
   public MediaItem getMediaItem() {
     return mediaItem;

library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaSourceTest.java

@@ -21,7 +21,6 @@ import static org.mockito.Mockito.mock;
 
 import android.net.Uri;
 import android.os.SystemClock;
-import androidx.annotation.Nullable;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.MediaItem;
@@ -83,35 +82,6 @@ public class HlsMediaSourceTest {
     assertThat(hlsMediaItem.playbackProperties.tag).isEqualTo(mediaItemTag);
   }
 
-  // Tests backwards compatibility
-  @SuppressWarnings("deprecation")
-  @Test
-  public void factorySetTag_setsDeprecatedMediaSourceTag() {
-    Object tag = new Object();
-    MediaItem mediaItem = MediaItem.fromUri("http://www.google.com");
-    HlsMediaSource.Factory factory =
-        new HlsMediaSource.Factory(mock(DataSource.Factory.class)).setTag(tag);
-
-    @Nullable Object mediaSourceTag = factory.createMediaSource(mediaItem).getTag();
-
-    assertThat(mediaSourceTag).isEqualTo(tag);
-  }
-
-  // Tests backwards compatibility
-  @SuppressWarnings("deprecation")
-  @Test
-  public void factoryCreateMediaSource_setsDeprecatedMediaSourceTag() {
-    Object tag = new Object();
-    MediaItem mediaItem =
-        new MediaItem.Builder().setUri("http://www.google.com").setTag(tag).build();
-    HlsMediaSource.Factory factory =
-        new HlsMediaSource.Factory(mock(DataSource.Factory.class)).setTag(new Object());
-
-    @Nullable Object mediaSourceTag = factory.createMediaSource(mediaItem).getTag();
-
-    assertThat(mediaSourceTag).isEqualTo(tag);
-  }
-
   // Tests backwards compatibility
   @SuppressWarnings("deprecation")
   @Test

library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java

@@ -424,17 +424,6 @@ public final class SsMediaSource extends BaseMediaSource
 
   // MediaSource implementation.
 
-  /**
-   * @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
-   */
-  @SuppressWarnings("deprecation")
-  @Deprecated
-  @Override
-  @Nullable
-  public Object getTag() {
-    return playbackProperties.tag;
-  }
-
   @Override
   public MediaItem getMediaItem() {
     return mediaItem;

library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSourceTest.java

@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.source.smoothstreaming;
 import static com.google.android.exoplayer2.util.Util.castNonNull;
 import static com.google.common.truth.Truth.assertThat;
 
-import androidx.annotation.Nullable;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.offline.StreamKey;
@@ -67,34 +66,6 @@ public class SsMediaSourceTest {
     assertThat(ssMediaItem.playbackProperties.tag).isEqualTo(mediaItemTag);
   }
 
-  // Tests backwards compatibility
-  @SuppressWarnings("deprecation")
-  @Test
-  public void factorySetTag_setsDeprecatedMediaSourceTag() {
-    Object tag = new Object();
-    MediaItem mediaItem = MediaItem.fromUri("http://www.google.com");
-    SsMediaSource.Factory factory =
-        new SsMediaSource.Factory(new FileDataSource.Factory()).setTag(tag);
-
-    @Nullable Object mediaSourceTag = factory.createMediaSource(mediaItem).getTag();
-
-    assertThat(mediaSourceTag).isEqualTo(tag);
-  }
-
-  // Tests backwards compatibility
-  @SuppressWarnings("deprecation")
-  @Test
-  public void factoryCreateMediaSource_setsDeprecatedMediaSourceTag() {
-    Object tag = new Object();
-    MediaItem mediaItem =
-        new MediaItem.Builder().setUri("http://www.google.com").setTag(tag).build();
-    SsMediaSource.Factory factory = new SsMediaSource.Factory(new FileDataSource.Factory());
-
-    @Nullable Object mediaSourceTag = factory.createMediaSource(mediaItem).getTag();
-
-    assertThat(mediaSourceTag).isEqualTo(tag);
-  }
-
   // Tests backwards compatibility
   @SuppressWarnings("deprecation")
   @Test

testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java

@@ -179,20 +179,6 @@ public class FakeMediaSource extends BaseMediaSource {
     return timeline;
   }
 
-  /**
-   * @deprecated Use {@link #getMediaItem()} and {@link MediaItem.PlaybackProperties#tag} instead.
-   */
-  @SuppressWarnings("deprecation")
-  @Deprecated
-  @Override
-  @Nullable
-  public Object getTag() {
-    if (timeline == null || timeline.isEmpty()) {
-      return null;
-    }
-    return timeline.getWindow(0, new Timeline.Window()).tag;
-  }
-
   @Override
   public MediaItem getMediaItem() {
     if (timeline == null || timeline.isEmpty()) {