chore(MediaSource): move getTag after removeEventListener

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

@@ -76,6 +76,12 @@ public final class ImaAdsMediaSource extends BaseMediaSource implements SourceIn
         adUiViewGroup, eventHandler, eventListener);
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return adsMediaSource.getTag();
+  }
+
   @Override
   public void prepareSourceInternal(
       final ExoPlayer player,
@@ -100,12 +106,6 @@ public final class ImaAdsMediaSource extends BaseMediaSource implements SourceIn
     adsMediaSource.releasePeriod(mediaPeriod);
   }
 
-  @Override
-  @Nullable
-  public Object getTag() {
-    return adsMediaSource.getTag();
-  }
-
   @Override
   public void releaseSourceInternal() {
     adsMediaSource.releaseSource(/* listener= */ this);

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

@@ -186,6 +186,12 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> {
     window = new Timeline.Window();
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return mediaSource.getTag();
+  }
+
   @Override
   public void prepareSourceInternal(
       ExoPlayer player,
@@ -224,12 +230,6 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> {
     }
   }
 
-  @Override
-  @Nullable
-  public Object getTag() {
-    return mediaSource.getTag();
-  }
-
   @Override
   public void releaseSourceInternal() {
     super.releaseSourceInternal();

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

@@ -453,6 +453,12 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
     }
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return null;
+  }
+
   @Override
   public final synchronized void prepareSourceInternal(
       ExoPlayer player,
@@ -508,12 +514,6 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
     maybeReleaseChildSource(holder);
   }
 
-  @Override
-  @Nullable
-  public Object getTag() {
-    return null;
-  }
-
   @Override
   public final void releaseSourceInternal() {
     super.releaseSourceInternal();

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

@@ -358,6 +358,12 @@ public final class ExtractorMediaSource extends BaseMediaSource
     this.tag = tag;
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return tag;
+  }
+
   @Override
   public void prepareSourceInternal(
       ExoPlayer player,
@@ -395,12 +401,6 @@ public final class ExtractorMediaSource extends BaseMediaSource
     ((ExtractorMediaPeriod) mediaPeriod).release();
   }
 
-  @Override
-  @Nullable
-  public Object getTag() {
-    return tag;
-  }
-
   @Override
   public void releaseSourceInternal() {
     // Do nothing.

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

@@ -64,6 +64,12 @@ public final class LoopingMediaSource extends CompositeMediaSource<Void> {
     mediaPeriodToChildMediaPeriodId = new HashMap<>();
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return childSource.getTag();
+  }
+
   @Override
   public void prepareSourceInternal(
       ExoPlayer player,
@@ -95,12 +101,6 @@ public final class LoopingMediaSource extends CompositeMediaSource<Void> {
     }
   }
 
-  @Override
-  @Nullable
-  public Object getTag() {
-    return childSource.getTag();
-  }
-
   @Override
   protected void onChildSourceInfoRefreshed(
       Void id, MediaSource mediaSource, Timeline timeline, @Nullable Object manifest) {

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

@@ -219,6 +219,11 @@ public interface MediaSource {
    */
   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
    * updates.
@@ -275,11 +280,6 @@ public interface MediaSource {
    */
   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
    * required.

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

@@ -98,6 +98,12 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> {
     timelines = new Timeline[mediaSources.length];
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return mediaSources.length > 0 ? mediaSources[0].getTag() : null;
+  }
+
   @Override
   public void prepareSourceInternal(
       ExoPlayer player,
@@ -137,12 +143,6 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> {
     }
   }
 
-  @Override
-  @Nullable
-  public Object getTag() {
-    return mediaSources.length > 0 ? mediaSources[0].getTag() : null;
-  }
-
   @Override
   public void releaseSourceInternal() {
     super.releaseSourceInternal();

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

@@ -297,6 +297,12 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
 
   // MediaSource implementation.
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return tag;
+  }
+
   @Override
   public void prepareSourceInternal(
       ExoPlayer player,
@@ -329,12 +335,6 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
     ((SingleSampleMediaPeriod) mediaPeriod).release();
   }
 
-  @Override
-  @Nullable
-  public Object getTag() {
-    return tag;
-  }
-
   @Override
   public void releaseSourceInternal() {
     // Do nothing.

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

@@ -319,6 +319,12 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
     adsLoader.setSupportedContentTypes(adMediaSourceFactory.getSupportedTypes());
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return contentMediaSource.getTag();
+  }
+
   @Override
   public void prepareSourceInternal(
       final ExoPlayer player,
@@ -387,12 +393,6 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
     deferredMediaPeriod.releasePeriod();
   }
 
-  @Override
-  @Nullable
-  public Object getTag() {
-    return contentMediaSource.getTag();
-  }
-
   @Override
   public void releaseSourceInternal() {
     super.releaseSourceInternal();

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

@@ -607,6 +607,12 @@ public final class DashMediaSource extends BaseMediaSource {
 
   // MediaSource implementation.
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return tag;
+  }
+
   @Override
   public void prepareSourceInternal(
       ExoPlayer player,
@@ -658,12 +664,6 @@ public final class DashMediaSource extends BaseMediaSource {
     periodsById.remove(dashMediaPeriod.id);
   }
 
-  @Override
-  @Nullable
-  public Object getTag() {
-    return tag;
-  }
-
   @Override
   public void releaseSourceInternal() {
     manifestLoadPending = false;

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

@@ -390,6 +390,12 @@ public final class HlsMediaSource extends BaseMediaSource
     this.tag = tag;
   }
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return tag;
+  }
+
   @Override
   public void prepareSourceInternal(
       ExoPlayer player,
@@ -425,12 +431,6 @@ public final class HlsMediaSource extends BaseMediaSource
     ((HlsMediaPeriod) mediaPeriod).release();
   }
 
-  @Override
-  @Nullable
-  public Object getTag() {
-    return tag;
-  }
-
   @Override
   public void releaseSourceInternal() {
     playlistTracker.stop();

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

@@ -503,6 +503,12 @@ public final class SsMediaSource extends BaseMediaSource
 
   // MediaSource implementation.
 
+  @Override
+  @Nullable
+  public Object getTag() {
+    return tag;
+  }
+
   @Override
   public void prepareSourceInternal(
       ExoPlayer player,
@@ -549,12 +555,6 @@ public final class SsMediaSource extends BaseMediaSource
     mediaPeriods.remove(period);
   }
 
-  @Override
-  @Nullable
-  public Object getTag() {
-    return tag;
-  }
-
   @Override
   public void releaseSourceInternal() {
     manifest = sideloadedManifest ? manifest : null;

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

@@ -88,6 +88,14 @@ public class FakeMediaSource extends BaseMediaSource {
     this.trackGroupArray = trackGroupArray;
   }
 
+  @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(
       ExoPlayer player,
@@ -133,14 +141,6 @@ public class FakeMediaSource extends BaseMediaSource {
     fakeMediaPeriod.release();
   }
 
-  @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() {
     assertThat(preparedSource).isTrue();