chore(MediaSource): move getTag after removeEventListener

extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java

@@ -77,6 +77,12 @@ public final class ImaAdsMediaSource extends BaseMediaSource implements SourceIn
   }
   }
 
 
   @Override
   @Override
+  @Nullable
+  public Object getTag() {
+    return adsMediaSource.getTag();
+  }
+
+  @Override
   public void prepareSourceInternal(
   public void prepareSourceInternal(
       final ExoPlayer player,
       final ExoPlayer player,
       boolean isTopLevelSource,
       boolean isTopLevelSource,
@@ -101,12 +107,6 @@ public final class ImaAdsMediaSource extends BaseMediaSource implements SourceIn
   }
   }
 
 
   @Override
   @Override
-  @Nullable
-  public Object getTag() {
-    return adsMediaSource.getTag();
-  }
-
-  @Override
   public void releaseSourceInternal() {
   public void releaseSourceInternal() {
     adsMediaSource.releaseSource(/* listener= */ this);
     adsMediaSource.releaseSource(/* listener= */ this);
   }
   }

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

@@ -187,6 +187,12 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> {
   }
   }
 
 
   @Override
   @Override
+  @Nullable
+  public Object getTag() {
+    return mediaSource.getTag();
+  }
+
+  @Override
   public void prepareSourceInternal(
   public void prepareSourceInternal(
       ExoPlayer player,
       ExoPlayer player,
       boolean isTopLevelSource,
       boolean isTopLevelSource,
@@ -225,12 +231,6 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> {
   }
   }
 
 
   @Override
   @Override
-  @Nullable
-  public Object getTag() {
-    return mediaSource.getTag();
-  }
-
-  @Override
   public void releaseSourceInternal() {
   public void releaseSourceInternal() {
     super.releaseSourceInternal();
     super.releaseSourceInternal();
     clippingError = null;
     clippingError = null;

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

@@ -454,6 +454,12 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
   }
   }
 
 
   @Override
   @Override
+  @Nullable
+  public Object getTag() {
+    return null;
+  }
+
+  @Override
   public final synchronized void prepareSourceInternal(
   public final synchronized void prepareSourceInternal(
       ExoPlayer player,
       ExoPlayer player,
       boolean isTopLevelSource,
       boolean isTopLevelSource,
@@ -509,12 +515,6 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
   }
   }
 
 
   @Override
   @Override
-  @Nullable
-  public Object getTag() {
-    return null;
-  }
-
-  @Override
   public final void releaseSourceInternal() {
   public final void releaseSourceInternal() {
     super.releaseSourceInternal();
     super.releaseSourceInternal();
     mediaSourceHolders.clear();
     mediaSourceHolders.clear();

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

@@ -359,6 +359,12 @@ public final class ExtractorMediaSource extends BaseMediaSource
   }
   }
 
 
   @Override
   @Override
+  @Nullable
+  public Object getTag() {
+    return tag;
+  }
+
+  @Override
   public void prepareSourceInternal(
   public void prepareSourceInternal(
       ExoPlayer player,
       ExoPlayer player,
       boolean isTopLevelSource,
       boolean isTopLevelSource,
@@ -396,12 +402,6 @@ public final class ExtractorMediaSource extends BaseMediaSource
   }
   }
 
 
   @Override
   @Override
-  @Nullable
-  public Object getTag() {
-    return tag;
-  }
-
-  @Override
   public void releaseSourceInternal() {
   public void releaseSourceInternal() {
     // Do nothing.
     // Do nothing.
   }
   }

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

@@ -65,6 +65,12 @@ public final class LoopingMediaSource extends CompositeMediaSource<Void> {
   }
   }
 
 
   @Override
   @Override
+  @Nullable
+  public Object getTag() {
+    return childSource.getTag();
+  }
+
+  @Override
   public void prepareSourceInternal(
   public void prepareSourceInternal(
       ExoPlayer player,
       ExoPlayer player,
       boolean isTopLevelSource,
       boolean isTopLevelSource,
@@ -96,12 +102,6 @@ public final class LoopingMediaSource extends CompositeMediaSource<Void> {
   }
   }
 
 
   @Override
   @Override
-  @Nullable
-  public Object getTag() {
-    return childSource.getTag();
-  }
-
-  @Override
   protected void onChildSourceInfoRefreshed(
   protected void onChildSourceInfoRefreshed(
       Void id, MediaSource mediaSource, Timeline timeline, @Nullable Object manifest) {
       Void id, MediaSource mediaSource, Timeline timeline, @Nullable Object manifest) {
     Timeline loopingTimeline =
     Timeline loopingTimeline =

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

@@ -220,6 +220,11 @@ public interface MediaSource {
   void removeEventListener(MediaSourceEventListener eventListener);
   void removeEventListener(MediaSourceEventListener eventListener);
 
 
   /**
   /**
+   * Returns the tag set on the media source, or null when none was set.
+   */
+  @Nullable Object getTag();
+
+  /**
    * Starts source preparation if not yet started, and adds a listener for timeline and/or manifest
    * Starts source preparation if not yet started, and adds a listener for timeline and/or manifest
    * updates.
    * updates.
    *
    *
@@ -276,11 +281,6 @@ public interface MediaSource {
   void releasePeriod(MediaPeriod mediaPeriod);
   void releasePeriod(MediaPeriod mediaPeriod);
 
 
   /**
   /**
-   * Returns the tag set on media source, or null when none was set.
-   */
-  Object getTag();
-
-  /**
    * Removes a listener for timeline and/or manifest updates and releases the source if no longer
    * Removes a listener for timeline and/or manifest updates and releases the source if no longer
    * required.
    * required.
    *
    *

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

@@ -99,6 +99,12 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> {
   }
   }
 
 
   @Override
   @Override
+  @Nullable
+  public Object getTag() {
+    return mediaSources.length > 0 ? mediaSources[0].getTag() : null;
+  }
+
+  @Override
   public void prepareSourceInternal(
   public void prepareSourceInternal(
       ExoPlayer player,
       ExoPlayer player,
       boolean isTopLevelSource,
       boolean isTopLevelSource,
@@ -138,12 +144,6 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> {
   }
   }
 
 
   @Override
   @Override
-  @Nullable
-  public Object getTag() {
-    return mediaSources.length > 0 ? mediaSources[0].getTag() : null;
-  }
-
-  @Override
   public void releaseSourceInternal() {
   public void releaseSourceInternal() {
     super.releaseSourceInternal();
     super.releaseSourceInternal();
     Arrays.fill(timelines, null);
     Arrays.fill(timelines, null);

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

@@ -298,6 +298,12 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
   // MediaSource implementation.
   // MediaSource implementation.
 
 
   @Override
   @Override
+  @Nullable
+  public Object getTag() {
+    return tag;
+  }
+
+  @Override
   public void prepareSourceInternal(
   public void prepareSourceInternal(
       ExoPlayer player,
       ExoPlayer player,
       boolean isTopLevelSource,
       boolean isTopLevelSource,
@@ -330,12 +336,6 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
   }
   }
 
 
   @Override
   @Override
-  @Nullable
-  public Object getTag() {
-    return tag;
-  }
-
-  @Override
   public void releaseSourceInternal() {
   public void releaseSourceInternal() {
     // Do nothing.
     // Do nothing.
   }
   }

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

@@ -320,6 +320,12 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
   }
   }
 
 
   @Override
   @Override
+  @Nullable
+  public Object getTag() {
+    return contentMediaSource.getTag();
+  }
+
+  @Override
   public void prepareSourceInternal(
   public void prepareSourceInternal(
       final ExoPlayer player,
       final ExoPlayer player,
       boolean isTopLevelSource,
       boolean isTopLevelSource,
@@ -388,12 +394,6 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
   }
   }
 
 
   @Override
   @Override
-  @Nullable
-  public Object getTag() {
-    return contentMediaSource.getTag();
-  }
-
-  @Override
   public void releaseSourceInternal() {
   public void releaseSourceInternal() {
     super.releaseSourceInternal();
     super.releaseSourceInternal();
     componentListener.release();
     componentListener.release();

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

@@ -608,6 +608,12 @@ public final class DashMediaSource extends BaseMediaSource {
   // MediaSource implementation.
   // MediaSource implementation.
 
 
   @Override
   @Override
+  @Nullable
+  public Object getTag() {
+    return tag;
+  }
+
+  @Override
   public void prepareSourceInternal(
   public void prepareSourceInternal(
       ExoPlayer player,
       ExoPlayer player,
       boolean isTopLevelSource,
       boolean isTopLevelSource,
@@ -659,12 +665,6 @@ public final class DashMediaSource extends BaseMediaSource {
   }
   }
 
 
   @Override
   @Override
-  @Nullable
-  public Object getTag() {
-    return tag;
-  }
-
-  @Override
   public void releaseSourceInternal() {
   public void releaseSourceInternal() {
     manifestLoadPending = false;
     manifestLoadPending = false;
     dataSource = null;
     dataSource = null;

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

@@ -391,6 +391,12 @@ public final class HlsMediaSource extends BaseMediaSource
   }
   }
 
 
   @Override
   @Override
+  @Nullable
+  public Object getTag() {
+    return tag;
+  }
+
+  @Override
   public void prepareSourceInternal(
   public void prepareSourceInternal(
       ExoPlayer player,
       ExoPlayer player,
       boolean isTopLevelSource,
       boolean isTopLevelSource,
@@ -426,12 +432,6 @@ public final class HlsMediaSource extends BaseMediaSource
   }
   }
 
 
   @Override
   @Override
-  @Nullable
-  public Object getTag() {
-    return tag;
-  }
-
-  @Override
   public void releaseSourceInternal() {
   public void releaseSourceInternal() {
     playlistTracker.stop();
     playlistTracker.stop();
   }
   }

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

@@ -504,6 +504,12 @@ public final class SsMediaSource extends BaseMediaSource
   // MediaSource implementation.
   // MediaSource implementation.
 
 
   @Override
   @Override
+  @Nullable
+  public Object getTag() {
+    return tag;
+  }
+
+  @Override
   public void prepareSourceInternal(
   public void prepareSourceInternal(
       ExoPlayer player,
       ExoPlayer player,
       boolean isTopLevelSource,
       boolean isTopLevelSource,
@@ -550,12 +556,6 @@ public final class SsMediaSource extends BaseMediaSource
   }
   }
 
 
   @Override
   @Override
-  @Nullable
-  public Object getTag() {
-    return tag;
-  }
-
-  @Override
   public void releaseSourceInternal() {
   public void releaseSourceInternal() {
     manifest = sideloadedManifest ? manifest : null;
     manifest = sideloadedManifest ? manifest : null;
     manifestDataSource = null;
     manifestDataSource = null;

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

@@ -89,6 +89,14 @@ public class FakeMediaSource extends BaseMediaSource {
   }
   }
 
 
   @Override
   @Override
+  @Nullable
+  public Object getTag() {
+    boolean hasTimeline = timeline != null && !timeline.isEmpty();
+
+    return hasTimeline ? timeline.getWindow(0, new Timeline.Window()).tag : null;
+  }
+
+  @Override
   public synchronized void prepareSourceInternal(
   public synchronized void prepareSourceInternal(
       ExoPlayer player,
       ExoPlayer player,
       boolean isTopLevelSource,
       boolean isTopLevelSource,
@@ -134,14 +142,6 @@ public class FakeMediaSource extends BaseMediaSource {
   }
   }
 
 
   @Override
   @Override
-  @Nullable
-  public Object getTag() {
-    boolean hasTimeline = timeline != null && !timeline.isEmpty();
-
-    return hasTimeline ? timeline.getWindow(0, new Timeline.Window()).tag : null;
-  }
-
-  @Override
   public void releaseSourceInternal() {
   public void releaseSourceInternal() {
     assertThat(preparedSource).isTrue();
     assertThat(preparedSource).isTrue();
     assertThat(releasedSource).isFalse();
     assertThat(releasedSource).isFalse();