diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 9da943fb0d..4ff9f72e03 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -58,6 +58,10 @@ * Test Utilities: * Demo app: * Remove deprecated symbols: + * Removed deprecated `SegmentDownloader` constructor + `SegmentDownloader(MediaItem, Parser, CacheDataSource.Factory, + Executor)` and the corresponding constructors in its subclasses + `DashDownloader`, `HlsDownloader` and `SsDownloader`. ## 1.6 diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/offline/SegmentDownloader.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/offline/SegmentDownloader.java index 9026fe11fa..0448b65fec 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/offline/SegmentDownloader.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/offline/SegmentDownloader.java @@ -101,24 +101,6 @@ public abstract class SegmentDownloader> impleme private volatile boolean isCanceled; - /** - * @deprecated Use {@link SegmentDownloader#SegmentDownloader(MediaItem, Parser, - * CacheDataSource.Factory, Executor, long)} instead. - */ - @Deprecated - public SegmentDownloader( - MediaItem mediaItem, - Parser manifestParser, - CacheDataSource.Factory cacheDataSourceFactory, - Executor executor) { - this( - mediaItem, - manifestParser, - cacheDataSourceFactory, - executor, - DEFAULT_MAX_MERGED_SEGMENT_START_TIME_DIFF_MS); - } - /** * @param mediaItem The {@link MediaItem} to be downloaded. * @param manifestParser A parser for manifests belonging to the media to be downloaded. diff --git a/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/offline/DashDownloader.java b/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/offline/DashDownloader.java index d7aa36033c..a473c1033c 100644 --- a/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/offline/DashDownloader.java +++ b/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/offline/DashDownloader.java @@ -109,24 +109,6 @@ public final class DashDownloader extends SegmentDownloader { DEFAULT_MAX_MERGED_SEGMENT_START_TIME_DIFF_MS); } - /** - * @deprecated Use {@link DashDownloader#DashDownloader(MediaItem, Parser, - * CacheDataSource.Factory, Executor, long)} instead. - */ - @Deprecated - public DashDownloader( - MediaItem mediaItem, - Parser manifestParser, - CacheDataSource.Factory cacheDataSourceFactory, - Executor executor) { - this( - mediaItem, - manifestParser, - cacheDataSourceFactory, - executor, - DEFAULT_MAX_MERGED_SEGMENT_START_TIME_DIFF_MS); - } - /** * Creates a new instance. * diff --git a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/offline/HlsDownloader.java b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/offline/HlsDownloader.java index 7c82bee608..432090a519 100644 --- a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/offline/HlsDownloader.java +++ b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/offline/HlsDownloader.java @@ -97,24 +97,6 @@ public final class HlsDownloader extends SegmentDownloader { DEFAULT_MAX_MERGED_SEGMENT_START_TIME_DIFF_MS); } - /** - * @deprecated Use {@link HlsDownloader#HlsDownloader(MediaItem, Parser, CacheDataSource.Factory, - * Executor, long)} instead. - */ - @Deprecated - public HlsDownloader( - MediaItem mediaItem, - Parser manifestParser, - CacheDataSource.Factory cacheDataSourceFactory, - Executor executor) { - this( - mediaItem, - manifestParser, - cacheDataSourceFactory, - executor, - DEFAULT_MAX_MERGED_SEGMENT_START_TIME_DIFF_MS); - } - /** * Creates a new instance. * diff --git a/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/offline/SsDownloader.java b/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/offline/SsDownloader.java index 6d2ded5a4c..5e6c963a94 100644 --- a/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/offline/SsDownloader.java +++ b/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/offline/SsDownloader.java @@ -97,24 +97,6 @@ public final class SsDownloader extends SegmentDownloader { DEFAULT_MAX_MERGED_SEGMENT_START_TIME_DIFF_MS); } - /** - * @deprecated Use {@link SsDownloader#SsDownloader(MediaItem, Parser, CacheDataSource.Factory, - * Executor, long)} instead. - */ - @Deprecated - public SsDownloader( - MediaItem mediaItem, - Parser manifestParser, - CacheDataSource.Factory cacheDataSourceFactory, - Executor executor) { - this( - mediaItem, - manifestParser, - cacheDataSourceFactory, - executor, - DEFAULT_MAX_MERGED_SEGMENT_START_TIME_DIFF_MS); - } - /** * Creates a new instance. *