From 924a76d5323e072eb075bf0a6e50fd5eda7fd064 Mon Sep 17 00:00:00 2001 From: olly Date: Fri, 24 Aug 2018 06:51:33 -0700 Subject: [PATCH] Clean up use of deprecated APIs - Add @Deprecated on overrides of deprecated method. - Suppress deprecation warnings where appropriate. - Use non-deprecated alternatives where appropriate. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=210092434 --- .../android/exoplayer2/imademo/PlayerManager.java | 4 +--- .../exoplayer2/demo/SampleChooserActivity.java | 3 ++- .../exoplayer2/ext/rtmp/RtmpDataSourceFactory.java | 6 +++++- .../android/exoplayer2/DefaultLoadControl.java | 8 +++++--- .../exoplayer2/DefaultRenderersFactory.java | 11 ++++++++--- .../com/google/android/exoplayer2/ExoPlayer.java | 2 ++ .../google/android/exoplayer2/ExoPlayerImpl.java | 4 ++++ .../java/com/google/android/exoplayer2/Player.java | 1 + .../google/android/exoplayer2/SimpleExoPlayer.java | 8 ++++++++ .../exoplayer2/source/ExtractorMediaSource.java | 5 +++++ .../exoplayer2/source/SingleSampleMediaSource.java | 4 ++++ .../trackselection/DefaultTrackSelector.java | 1 + .../trackselection/MappingTrackSelector.java | 1 + .../android/exoplayer2/upstream/DataSpec.java | 1 + .../exoplayer2/upstream/DefaultDataSource.java | 2 ++ .../upstream/DefaultDataSourceFactory.java | 7 ++++++- .../exoplayer2/upstream/DefaultHttpDataSource.java | 2 ++ .../upstream/DefaultHttpDataSourceFactory.java | 14 ++++++++++++-- .../exoplayer2/upstream/FileDataSourceFactory.java | 6 +++++- .../android/exoplayer2/upstream/UdpDataSource.java | 2 ++ .../android/exoplayer2/drm/DrmInitDataTest.java | 3 ++- .../trackselection/AdaptiveTrackSelectionTest.java | 1 + .../exoplayer2/source/hls/HlsMediaSource.java | 3 +++ .../source/smoothstreaming/SsMediaSource.java | 3 +++ .../android/exoplayer2/ui/PlaybackControlView.java | 3 +++ .../android/exoplayer2/ui/SimpleExoPlayerView.java | 4 ++++ .../testutil/FakeAdaptiveMediaPeriod.java | 11 ++++++----- .../exoplayer2/testutil/FakeTrackSelector.java | 5 +++-- .../android/exoplayer2/testutil/StubExoPlayer.java | 4 ++++ 29 files changed, 106 insertions(+), 23 deletions(-) diff --git a/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/PlayerManager.java b/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/PlayerManager.java index 97e618ba52..d67c4549d8 100644 --- a/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/PlayerManager.java +++ b/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/PlayerManager.java @@ -76,9 +76,7 @@ import com.google.android.exoplayer2.util.Util; contentMediaSource, /* adMediaSourceFactory= */ this, adsLoader, - playerView.getOverlayFrameLayout(), - /* eventHandler= */ null, - /* eventListener= */ null); + playerView.getOverlayFrameLayout()); // Prepare the player with the source. player.seekTo(contentPosition); diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java index 7dc7890020..6817fab780 100644 --- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java +++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java @@ -213,7 +213,8 @@ public class SampleChooserActivity extends Activity List result = new ArrayList<>(); Context context = getApplicationContext(); String userAgent = Util.getUserAgent(context, "ExoPlayerDemo"); - DataSource dataSource = new DefaultDataSource(context, null, userAgent, false); + DataSource dataSource = + new DefaultDataSource(context, userAgent, /* allowCrossProtocolRedirects= */ false); for (String uri : uris) { DataSpec dataSpec = new DataSpec(Uri.parse(uri)); InputStream inputStream = new DataSourceInputStream(dataSource, dataSpec); diff --git a/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSourceFactory.java b/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSourceFactory.java index 3cf9b8de37..d1350276f2 100644 --- a/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSourceFactory.java +++ b/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSourceFactory.java @@ -38,7 +38,11 @@ public final class RtmpDataSourceFactory implements DataSource.Factory { @Override public DataSource createDataSource() { - return new RtmpDataSource(listener); + RtmpDataSource dataSource = new RtmpDataSource(); + if (listener != null) { + dataSource.addTransferListener(listener); + } + return dataSource; } } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java b/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java index f8b7f5f5c2..c466815c79 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java @@ -154,6 +154,7 @@ public class DefaultLoadControl implements LoadControl { } /** Creates a {@link DefaultLoadControl}. */ + @SuppressWarnings("deprecation") public DefaultLoadControl createDefaultLoadControl() { if (allocator == null) { allocator = new DefaultAllocator(true, C.DEFAULT_BUFFER_SEGMENT_SIZE); @@ -183,15 +184,15 @@ public class DefaultLoadControl implements LoadControl { private int targetBufferSize; private boolean isBuffering; - /** - * Constructs a new instance, using the {@code DEFAULT_*} constants defined in this class. - */ + /** Constructs a new instance, using the {@code DEFAULT_*} constants defined in this class. */ + @SuppressWarnings("deprecation") public DefaultLoadControl() { this(new DefaultAllocator(true, C.DEFAULT_BUFFER_SEGMENT_SIZE)); } /** @deprecated Use {@link Builder} instead. */ @Deprecated + @SuppressWarnings("deprecation") public DefaultLoadControl(DefaultAllocator allocator) { this( allocator, @@ -205,6 +206,7 @@ public class DefaultLoadControl implements LoadControl { /** @deprecated Use {@link Builder} instead. */ @Deprecated + @SuppressWarnings("deprecation") public DefaultLoadControl( DefaultAllocator allocator, int minBufferMs, diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java index f625519b8a..ff7e953896 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java @@ -82,7 +82,7 @@ public class DefaultRenderersFactory implements RenderersFactory { protected static final int MAX_DROPPED_VIDEO_FRAME_COUNT_TO_NOTIFY = 50; private final Context context; - @Nullable private final DrmSessionManager drmSessionManager; + private final @Nullable DrmSessionManager drmSessionManager; private final @ExtensionRendererMode int extensionRendererMode; private final long allowedVideoJoiningTimeMs; @@ -98,6 +98,7 @@ public class DefaultRenderersFactory implements RenderersFactory { * directly to {@link SimpleExoPlayer} or {@link ExoPlayerFactory}. */ @Deprecated + @SuppressWarnings("deprecation") public DefaultRenderersFactory( Context context, @Nullable DrmSessionManager drmSessionManager) { this(context, drmSessionManager, EXTENSION_RENDERER_MODE_OFF); @@ -111,7 +112,7 @@ public class DefaultRenderersFactory implements RenderersFactory { */ public DefaultRenderersFactory( Context context, @ExtensionRendererMode int extensionRendererMode) { - this(context, null, extensionRendererMode, DEFAULT_ALLOWED_VIDEO_JOINING_TIME_MS); + this(context, extensionRendererMode, DEFAULT_ALLOWED_VIDEO_JOINING_TIME_MS); } /** @@ -119,6 +120,7 @@ public class DefaultRenderersFactory implements RenderersFactory { * DrmSessionManager} directly to {@link SimpleExoPlayer} or {@link ExoPlayerFactory}. */ @Deprecated + @SuppressWarnings("deprecation") public DefaultRenderersFactory( Context context, @Nullable DrmSessionManager drmSessionManager, @@ -138,7 +140,10 @@ public class DefaultRenderersFactory implements RenderersFactory { Context context, @ExtensionRendererMode int extensionRendererMode, long allowedVideoJoiningTimeMs) { - this(context, null, extensionRendererMode, allowedVideoJoiningTimeMs); + this.context = context; + this.extensionRendererMode = extensionRendererMode; + this.allowedVideoJoiningTimeMs = allowedVideoJoiningTimeMs; + this.drmSessionManager = null; } /** diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java index 5780f7b418..452c1043a3 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java @@ -227,6 +227,7 @@ public interface ExoPlayer extends Player { /** @deprecated Use {@link #createMessage(PlayerMessage.Target)} instead. */ @Deprecated + @SuppressWarnings("deprecation") void sendMessages(ExoPlayerMessage... messages); /** @@ -234,6 +235,7 @@ public interface ExoPlayer extends Player { * PlayerMessage#blockUntilDelivered()}. */ @Deprecated + @SuppressWarnings("deprecation") void blockingSendMessages(ExoPlayerMessage... messages); /** diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java index b663b1185c..5e0dd905b9 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java @@ -415,6 +415,8 @@ import java.util.concurrent.CopyOnWriteArraySet; } @Override + @Deprecated + @SuppressWarnings("deprecation") public void sendMessages(ExoPlayerMessage... messages) { for (ExoPlayerMessage message : messages) { createMessage(message.target).setType(message.messageType).setPayload(message.message).send(); @@ -432,6 +434,8 @@ import java.util.concurrent.CopyOnWriteArraySet; } @Override + @Deprecated + @SuppressWarnings("deprecation") public void blockingSendMessages(ExoPlayerMessage... messages) { List playerMessages = new ArrayList<>(); for (ExoPlayerMessage message : messages) { diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Player.java b/library/core/src/main/java/com/google/android/exoplayer2/Player.java index 0e4cf68aa4..32722ae41e 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/Player.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/Player.java @@ -392,6 +392,7 @@ public interface Player { abstract class DefaultEventListener implements EventListener { @Override + @SuppressWarnings("deprecation") public void onTimelineChanged( Timeline timeline, @Nullable Object manifest, @TimelineChangeReason int reason) { // Call deprecated version. Otherwise, do nothing. diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java index de150ddfe3..a86a8d4d79 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java @@ -604,6 +604,7 @@ public class SimpleExoPlayer * @deprecated Use {@link #addVideoListener(com.google.android.exoplayer2.video.VideoListener)}. */ @Deprecated + @SuppressWarnings("deprecation") public void setVideoListener(VideoListener listener) { videoListeners.clear(); if (listener != null) { @@ -619,6 +620,7 @@ public class SimpleExoPlayer * #removeVideoListener(com.google.android.exoplayer2.video.VideoListener)}. */ @Deprecated + @SuppressWarnings("deprecation") public void clearVideoListener(VideoListener listener) { removeVideoListener(listener); } @@ -709,6 +711,7 @@ public class SimpleExoPlayer * information. */ @Deprecated + @SuppressWarnings("deprecation") public void setVideoDebugListener(VideoRendererEventListener listener) { videoDebugListeners.retainAll(Collections.singleton(analyticsCollector)); if (listener != null) { @@ -739,6 +742,7 @@ public class SimpleExoPlayer * information. */ @Deprecated + @SuppressWarnings("deprecation") public void setAudioDebugListener(AudioRendererEventListener listener) { audioDebugListeners.retainAll(Collections.singleton(analyticsCollector)); if (listener != null) { @@ -939,6 +943,8 @@ public class SimpleExoPlayer } @Override + @Deprecated + @SuppressWarnings("deprecation") public void sendMessages(ExoPlayerMessage... messages) { player.sendMessages(messages); } @@ -949,6 +955,8 @@ public class SimpleExoPlayer } @Override + @Deprecated + @SuppressWarnings("deprecation") public void blockingSendMessages(ExoPlayerMessage... messages) { player.blockingSendMessages(messages); } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java index 2c0a98f431..66af3a7e62 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java @@ -262,6 +262,7 @@ public final class ExtractorMediaSource extends BaseMediaSource * @deprecated Use {@link Factory} instead. */ @Deprecated + @SuppressWarnings("deprecation") public ExtractorMediaSource( Uri uri, DataSource.Factory dataSourceFactory, @@ -284,6 +285,7 @@ public final class ExtractorMediaSource extends BaseMediaSource * @deprecated Use {@link Factory} instead. */ @Deprecated + @SuppressWarnings("deprecation") public ExtractorMediaSource( Uri uri, DataSource.Factory dataSourceFactory, @@ -316,6 +318,7 @@ public final class ExtractorMediaSource extends BaseMediaSource * @deprecated Use {@link Factory} instead. */ @Deprecated + @SuppressWarnings("deprecation") public ExtractorMediaSource( Uri uri, DataSource.Factory dataSourceFactory, @@ -426,6 +429,8 @@ public final class ExtractorMediaSource extends BaseMediaSource * Wraps a deprecated {@link EventListener}, invoking its callback from the equivalent callback in * {@link MediaSourceEventListener}. */ + @Deprecated + @SuppressWarnings("deprecation") private static final class EventListenerWrapper extends DefaultMediaSourceEventListener { private final EventListener eventListener; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java index c75c9541a4..dc46b12b2e 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java @@ -197,6 +197,7 @@ public final class SingleSampleMediaSource extends BaseMediaSource { * @deprecated Use {@link Factory} instead. */ @Deprecated + @SuppressWarnings("deprecation") public SingleSampleMediaSource( Uri uri, DataSource.Factory dataSourceFactory, Format format, long durationUs) { this( @@ -249,6 +250,7 @@ public final class SingleSampleMediaSource extends BaseMediaSource { * @deprecated Use {@link Factory} instead. */ @Deprecated + @SuppressWarnings("deprecation") public SingleSampleMediaSource( Uri uri, DataSource.Factory dataSourceFactory, @@ -333,6 +335,8 @@ public final class SingleSampleMediaSource extends BaseMediaSource { * Wraps a deprecated {@link EventListener}, invoking its callback from the equivalent callback in * {@link MediaSourceEventListener}. */ + @Deprecated + @SuppressWarnings("deprecation") private static final class EventListenerWrapper extends DefaultMediaSourceEventListener { private final EventListener eventListener; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java index fbdbb8d95f..5e4aef958c 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java @@ -1095,6 +1095,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { * directly passed to the player in ExoPlayerFactory. */ @Deprecated + @SuppressWarnings("deprecation") public DefaultTrackSelector(BandwidthMeter bandwidthMeter) { this(new AdaptiveTrackSelection.Factory(bandwidthMeter)); } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java index a243b1a813..c2fda67728 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java @@ -99,6 +99,7 @@ public abstract class MappingTrackSelector extends TrackSelector { * each mapped track, indexed by renderer, track group and track (in that order). * @param unmappedTrackGroups {@link TrackGroup}s not mapped to any renderer. */ + @SuppressWarnings("deprecation") /* package */ MappedTrackInfo( int[] rendererTrackTypes, TrackGroupArray[] rendererTrackGroups, diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java index 653673ed97..c968921822 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java @@ -226,6 +226,7 @@ public final class DataSpec { * @param key {@link #key}. * @param flags {@link #flags}. */ + @SuppressWarnings("deprecation") public DataSpec( Uri uri, @HttpMethod int httpMethod, diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java index 23d6cc368f..411240d56c 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java @@ -142,6 +142,7 @@ public final class DefaultDataSource implements DataSource { * #addTransferListener(TransferListener)}. */ @Deprecated + @SuppressWarnings("deprecation") public DefaultDataSource( Context context, @Nullable TransferListener listener, @@ -167,6 +168,7 @@ public final class DefaultDataSource implements DataSource { * #addTransferListener(TransferListener)}. */ @Deprecated + @SuppressWarnings("deprecation") public DefaultDataSource( Context context, @Nullable TransferListener listener, diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java index 293ba7f17b..8183a89064 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java @@ -75,6 +75,11 @@ public final class DefaultDataSourceFactory implements Factory { @Override public DefaultDataSource createDataSource() { - return new DefaultDataSource(context, listener, baseDataSourceFactory.createDataSource()); + DefaultDataSource dataSource = + new DefaultDataSource(context, baseDataSourceFactory.createDataSource()); + if (listener != null) { + dataSource.addTransferListener(listener); + } + return dataSource; } } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java index 06e3dc7e79..f02f1cc7c4 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java @@ -168,6 +168,7 @@ public class DefaultHttpDataSource extends BaseDataSource implements HttpDataSou * #addTransferListener(TransferListener)}. */ @Deprecated + @SuppressWarnings("deprecation") public DefaultHttpDataSource( String userAgent, @Nullable Predicate contentTypePredicate, @@ -190,6 +191,7 @@ public class DefaultHttpDataSource extends BaseDataSource implements HttpDataSou * #addTransferListener(TransferListener)}. */ @Deprecated + @SuppressWarnings("deprecation") public DefaultHttpDataSource( String userAgent, @Nullable Predicate contentTypePredicate, diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceFactory.java index aa0ac7b97e..95ea49132d 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceFactory.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceFactory.java @@ -103,7 +103,17 @@ public final class DefaultHttpDataSourceFactory extends BaseFactory { @Override protected DefaultHttpDataSource createDataSourceInternal( HttpDataSource.RequestProperties defaultRequestProperties) { - return new DefaultHttpDataSource(userAgent, null, listener, connectTimeoutMillis, - readTimeoutMillis, allowCrossProtocolRedirects, defaultRequestProperties); + DefaultHttpDataSource dataSource = + new DefaultHttpDataSource( + userAgent, + /* contentTypePredicate= */ null, + connectTimeoutMillis, + readTimeoutMillis, + allowCrossProtocolRedirects, + defaultRequestProperties); + if (listener != null) { + dataSource.addTransferListener(listener); + } + return dataSource; } } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSourceFactory.java index f69adeb8c2..fd1920991e 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSourceFactory.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSourceFactory.java @@ -34,7 +34,11 @@ public final class FileDataSourceFactory implements DataSource.Factory { @Override public DataSource createDataSource() { - return new FileDataSource(listener); + FileDataSource dataSource = new FileDataSource(); + if (listener != null) { + dataSource.addTransferListener(listener); + } + return dataSource; } } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java index 47677d2c47..8d6b39fa98 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java @@ -95,6 +95,7 @@ public final class UdpDataSource extends BaseDataSource { * @deprecated Use {@link #UdpDataSource()} and {@link #addTransferListener(TransferListener)}. */ @Deprecated + @SuppressWarnings("deprecation") public UdpDataSource(@Nullable TransferListener listener) { this(listener, DEFAULT_MAX_PACKET_SIZE); } @@ -107,6 +108,7 @@ public final class UdpDataSource extends BaseDataSource { * @deprecated Use {@link #UdpDataSource(int)} and {@link #addTransferListener(TransferListener)}. */ @Deprecated + @SuppressWarnings("deprecation") public UdpDataSource(@Nullable TransferListener listener, int maxPacketSize) { this(listener, maxPacketSize, DEFAULT_SOCKET_TIMEOUT_MILLIS); } diff --git a/library/core/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java b/library/core/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java index 2b3bdd6a2f..2b740de113 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java @@ -96,7 +96,7 @@ public class DrmInitDataTest { } @Test - @Deprecated + @SuppressWarnings("deprecation") public void testGetByUuid() { // Basic matching. DrmInitData testInitData = new DrmInitData(DATA_1, DATA_2); @@ -130,6 +130,7 @@ public class DrmInitDataTest { } @Test + @SuppressWarnings("deprecation") public void testSchemeDatasWithSameUuid() { DrmInitData testInitData = new DrmInitData(DATA_1, DATA_1B); assertThat(testInitData.schemeDataCount).isEqualTo(2); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java index 730572bbd8..348352eb30 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java @@ -63,6 +63,7 @@ public final class AdaptiveTrackSelectionTest { BandwidthMeter initialBandwidthMeter = mock(BandwidthMeter.class); BandwidthMeter injectedBandwidthMeter = mock(BandwidthMeter.class); Format format = videoFormat(/* bitrate= */ 500, /* width= */ 320, /* height= */ 240); + @SuppressWarnings("deprecation") AdaptiveTrackSelection adaptiveTrackSelection = new AdaptiveTrackSelection.Factory(initialBandwidthMeter) .createTrackSelection(new TrackGroup(format), injectedBandwidthMeter, /* tracks= */ 0); 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 24067fcab1..79b030a0ee 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 @@ -309,6 +309,7 @@ public final class HlsMediaSource extends BaseMediaSource * @deprecated Use {@link Factory} instead. */ @Deprecated + @SuppressWarnings("deprecation") public HlsMediaSource( Uri manifestUri, DataSource.Factory dataSourceFactory, @@ -334,6 +335,7 @@ public final class HlsMediaSource extends BaseMediaSource * @deprecated Use {@link Factory} instead. */ @Deprecated + @SuppressWarnings("deprecation") public HlsMediaSource( Uri manifestUri, DataSource.Factory dataSourceFactory, @@ -364,6 +366,7 @@ public final class HlsMediaSource extends BaseMediaSource * @deprecated Use {@link Factory} instead. */ @Deprecated + @SuppressWarnings("deprecation") public HlsMediaSource( Uri manifestUri, HlsDataSourceFactory dataSourceFactory, 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 83f1a59c8b..a756b7f4f1 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 @@ -330,6 +330,7 @@ public final class SsMediaSource extends BaseMediaSource * @deprecated Use {@link Factory} instead. */ @Deprecated + @SuppressWarnings("deprecation") public SsMediaSource( SsManifest manifest, SsChunkSource.Factory chunkSourceFactory, @@ -388,6 +389,7 @@ public final class SsMediaSource extends BaseMediaSource * @deprecated Use {@link Factory} instead. */ @Deprecated + @SuppressWarnings("deprecation") public SsMediaSource( Uri manifestUri, DataSource.Factory manifestDataSourceFactory, @@ -420,6 +422,7 @@ public final class SsMediaSource extends BaseMediaSource * @deprecated Use {@link Factory} instead. */ @Deprecated + @SuppressWarnings("deprecation") public SsMediaSource( Uri manifestUri, DataSource.Factory manifestDataSourceFactory, diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlaybackControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlaybackControlView.java index da03d28cba..5467538c0f 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlaybackControlView.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlaybackControlView.java @@ -34,10 +34,13 @@ public class PlaybackControlView extends PlayerControlView { public interface VisibilityListener extends com.google.android.exoplayer2.ui.PlayerControlView.VisibilityListener {} + @Deprecated + @SuppressWarnings("deprecation") private static final class DefaultControlDispatcher extends com.google.android.exoplayer2.DefaultControlDispatcher implements ControlDispatcher {} /** @deprecated Use {@link com.google.android.exoplayer2.DefaultControlDispatcher}. */ @Deprecated + @SuppressWarnings("deprecation") public static final ControlDispatcher DEFAULT_CONTROL_DISPATCHER = new DefaultControlDispatcher(); /** The default fast forward increment, in milliseconds. */ diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java index b8098b6fa7..55745a7cb5 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java @@ -20,6 +20,7 @@ import android.content.Context; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.util.AttributeSet; +import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.SimpleExoPlayer; /** @deprecated Use {@link PlayerView}. */ @@ -45,7 +46,10 @@ public final class SimpleExoPlayerView extends PlayerView { * @param player The player whose target view is being switched. * @param oldPlayerView The old view to detach from the player. * @param newPlayerView The new view to attach to the player. + * @deprecated Use {@link PlayerView#switchTargetView(Player, PlayerView, PlayerView)} instead. */ + @Deprecated + @SuppressWarnings("deprecation") public static void switchTargetView( @NonNull SimpleExoPlayer player, @Nullable SimpleExoPlayerView oldPlayerView, diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaPeriod.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaPeriod.java index 70c40b76e9..f8bf950ef2 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaPeriod.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaPeriod.java @@ -25,6 +25,7 @@ import com.google.android.exoplayer2.source.TrackGroupArray; import com.google.android.exoplayer2.source.chunk.ChunkSampleStream; import com.google.android.exoplayer2.trackselection.TrackSelection; import com.google.android.exoplayer2.upstream.Allocator; +import com.google.android.exoplayer2.upstream.DefaultLoadErrorHandlingPolicy; import com.google.android.exoplayer2.upstream.TransferListener; import com.google.android.exoplayer2.util.MimeTypes; import java.util.ArrayList; @@ -142,13 +143,13 @@ public class FakeAdaptiveMediaPeriod extends FakeMediaPeriod chunkSourceFactory.createChunkSource(trackSelection, durationUs, transferListener); return new ChunkSampleStream<>( MimeTypes.getTrackType(trackSelection.getSelectedFormat().sampleMimeType), - null, - null, + /* embeddedTrackTypes= */ null, + /* embeddedTrackFormats= */ null, chunkSource, - this, + /* callback= */ this, allocator, - 0, - 3, + /* positionUs= */ 0, + new DefaultLoadErrorHandlingPolicy(/* minimumLoadableRetryCount= */ 3), eventDispatcher); } diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackSelector.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackSelector.java index 4d4a53bcdd..d3eca63461 100644 --- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackSelector.java +++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackSelector.java @@ -51,8 +51,9 @@ public class FakeTrackSelector extends DefaultTrackSelector { int[] rendererMixedMimeTypeAdaptationSupports, Parameters params) throws ExoPlaybackException { - TrackSelection[] selections = new TrackSelection[mappedTrackInfo.length]; - for (int i = 0; i < mappedTrackInfo.length; i++) { + int rendererCount = mappedTrackInfo.getRendererCount(); + TrackSelection[] selections = new TrackSelection[rendererCount]; + for (int i = 0; i < rendererCount; i++) { TrackGroupArray trackGroupArray = mappedTrackInfo.getTrackGroups(i); boolean hasTracks = trackGroupArray.length > 0; selections[i] = hasTracks ? reuseOrCreateTrackSelection(trackGroupArray.get(0)) : null; diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java index 6c99da55cc..be41aa3eeb 100644 --- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java +++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java @@ -190,11 +190,15 @@ public abstract class StubExoPlayer implements ExoPlayer { } @Override + @Deprecated + @SuppressWarnings("deprecation") public void sendMessages(ExoPlayerMessage... messages) { throw new UnsupportedOperationException(); } @Override + @Deprecated + @SuppressWarnings("deprecation") public void blockingSendMessages(ExoPlayerMessage... messages) { throw new UnsupportedOperationException(); }