From aefba8a5655f8a6836a1ca5f9a7a04f034005057 Mon Sep 17 00:00:00 2001 From: tonihei Date: Fri, 30 Jun 2023 14:05:39 +0000 Subject: [PATCH] Remove dead code in ProgressiveMediaSource.Builder These fields cannot be set and the logic to handle them can be removed. PiperOrigin-RevId: 544646460 (cherry picked from commit 2f113c8b8234ca80fd0968f845dd195fcf956c6d) --- .../exoplayer/source/ProgressiveMediaSource.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ProgressiveMediaSource.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ProgressiveMediaSource.java index 47757865ed..5535fc8d7f 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ProgressiveMediaSource.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ProgressiveMediaSource.java @@ -62,8 +62,6 @@ public final class ProgressiveMediaSource extends BaseMediaSource private DrmSessionManagerProvider drmSessionManagerProvider; private LoadErrorHandlingPolicy loadErrorHandlingPolicy; private int continueLoadingCheckIntervalBytes; - @Nullable private String customCacheKey; - @Nullable private Object tag; /** * Creates a new factory for {@link ProgressiveMediaSource}s. @@ -207,16 +205,6 @@ public final class ProgressiveMediaSource extends BaseMediaSource @Override public ProgressiveMediaSource createMediaSource(MediaItem mediaItem) { checkNotNull(mediaItem.localConfiguration); - boolean needsTag = mediaItem.localConfiguration.tag == null && tag != null; - boolean needsCustomCacheKey = - mediaItem.localConfiguration.customCacheKey == null && customCacheKey != null; - if (needsTag && needsCustomCacheKey) { - mediaItem = mediaItem.buildUpon().setTag(tag).setCustomCacheKey(customCacheKey).build(); - } else if (needsTag) { - mediaItem = mediaItem.buildUpon().setTag(tag).build(); - } else if (needsCustomCacheKey) { - mediaItem = mediaItem.buildUpon().setCustomCacheKey(customCacheKey).build(); - } return new ProgressiveMediaSource( mediaItem, dataSourceFactory,