From d06e8136ee6dc5ff86a30953de7a9934d56584d8 Mon Sep 17 00:00:00 2001 From: ibaker Date: Mon, 8 Nov 2021 13:53:17 +0000 Subject: [PATCH] Add @Deprecated to MediaSourceFactory deprecated overrides This is needed to ensure the deprecation warning appears on usages in Android Studio and in javadoc. #minor-release PiperOrigin-RevId: 408319182 --- .../android/exoplayer2/source/DefaultMediaSourceFactory.java | 3 +++ .../android/exoplayer2/source/ProgressiveMediaSource.java | 4 ++++ .../android/exoplayer2/source/dash/DashMediaSource.java | 3 +++ .../google/android/exoplayer2/source/hls/HlsMediaSource.java | 3 +++ .../exoplayer2/source/smoothstreaming/SsMediaSource.java | 3 +++ 5 files changed, 16 insertions(+) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java index 0cbae12170..e24598032d 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java @@ -294,6 +294,7 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory { return this; } + @Deprecated @Override public DefaultMediaSourceFactory setDrmHttpDataSourceFactory( @Nullable HttpDataSource.Factory drmHttpDataSourceFactory) { @@ -301,12 +302,14 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory { return this; } + @Deprecated @Override public DefaultMediaSourceFactory setDrmUserAgent(@Nullable String userAgent) { delegateFactoryLoader.setDrmUserAgent(userAgent); return this; } + @Deprecated @Override public DefaultMediaSourceFactory setDrmSessionManager( @Nullable DrmSessionManager drmSessionManager) { diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java index 67d019ccee..1adc8e8648 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java @@ -175,6 +175,8 @@ public final class ProgressiveMediaSource extends BaseMediaSource return this; } + @Deprecated + @Override public Factory setDrmSessionManager(@Nullable DrmSessionManager drmSessionManager) { if (drmSessionManager == null) { setDrmSessionManagerProvider(null); @@ -184,6 +186,7 @@ public final class ProgressiveMediaSource extends BaseMediaSource return this; } + @Deprecated @Override public Factory setDrmHttpDataSourceFactory( @Nullable HttpDataSource.Factory drmHttpDataSourceFactory) { @@ -194,6 +197,7 @@ public final class ProgressiveMediaSource extends BaseMediaSource return this; } + @Deprecated @Override public Factory setDrmUserAgent(@Nullable String userAgent) { if (!usingCustomDrmSessionManagerProvider) { diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java index fac44d9a19..5b901bc092 100644 --- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java +++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java @@ -178,6 +178,7 @@ public final class DashMediaSource extends BaseMediaSource { return this; } + @Deprecated @Override public Factory setDrmSessionManager(@Nullable DrmSessionManager drmSessionManager) { if (drmSessionManager == null) { @@ -188,6 +189,7 @@ public final class DashMediaSource extends BaseMediaSource { return this; } + @Deprecated @Override public Factory setDrmHttpDataSourceFactory( @Nullable HttpDataSource.Factory drmHttpDataSourceFactory) { @@ -198,6 +200,7 @@ public final class DashMediaSource extends BaseMediaSource { return this; } + @Deprecated @Override public Factory setDrmUserAgent(@Nullable String userAgent) { if (!usingCustomDrmSessionManagerProvider) { diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java index 56ebfb5762..687d1bb0dd 100644 --- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java +++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java @@ -297,6 +297,7 @@ public final class HlsMediaSource extends BaseMediaSource return this; } + @Deprecated @Override public Factory setDrmSessionManager(@Nullable DrmSessionManager drmSessionManager) { if (drmSessionManager == null) { @@ -307,6 +308,7 @@ public final class HlsMediaSource extends BaseMediaSource return this; } + @Deprecated @Override public Factory setDrmHttpDataSourceFactory( @Nullable HttpDataSource.Factory drmHttpDataSourceFactory) { @@ -317,6 +319,7 @@ public final class HlsMediaSource extends BaseMediaSource return this; } + @Deprecated @Override public Factory setDrmUserAgent(@Nullable String userAgent) { if (!usingCustomDrmSessionManagerProvider) { diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java index fd2f3a49fe..5295bbab5b 100644 --- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java +++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java @@ -205,6 +205,7 @@ public final class SsMediaSource extends BaseMediaSource return this; } + @Deprecated @Override public Factory setDrmSessionManager(@Nullable DrmSessionManager drmSessionManager) { if (drmSessionManager == null) { @@ -215,6 +216,7 @@ public final class SsMediaSource extends BaseMediaSource return this; } + @Deprecated @Override public Factory setDrmHttpDataSourceFactory( @Nullable HttpDataSource.Factory drmHttpDataSourceFactory) { @@ -225,6 +227,7 @@ public final class SsMediaSource extends BaseMediaSource return this; } + @Deprecated @Override public Factory setDrmUserAgent(@Nullable String userAgent) { if (!usingCustomDrmSessionManagerProvider) {