Remove or suppress warnings where we use our own deprecated APIs

PiperOrigin-RevId: 277928790
This commit is contained in:
olly 2019-11-01 15:10:25 +00:00 committed by Oliver Woodman
parent 07e93c15f9
commit 8dcd1e53bc
5 changed files with 9 additions and 6 deletions

View file

@ -278,6 +278,7 @@ public final class ExoPlayerFactory {
* be passed to {@link SimpleExoPlayer.Builder} and should instead be injected into the {@link
* MediaSource} factories.
*/
@SuppressWarnings("deprecation")
@Deprecated
public static SimpleExoPlayer newSimpleInstance(
Context context,

View file

@ -253,6 +253,7 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto>
* to {@link ExoMediaDrm#getKeyRequest(byte[], List, int, HashMap)}. May be null.
* @deprecated Use {@link Builder} instead.
*/
@SuppressWarnings("deprecation")
@Deprecated
public DefaultDrmSessionManager(
UUID uuid,

View file

@ -21,7 +21,6 @@ import com.google.android.exoplayer2.upstream.DataSink;
import com.google.android.exoplayer2.upstream.DataSource;
import com.google.android.exoplayer2.upstream.DummyDataSource;
import com.google.android.exoplayer2.upstream.FileDataSource;
import com.google.android.exoplayer2.upstream.FileDataSourceFactory;
import com.google.android.exoplayer2.upstream.PriorityDataSourceFactory;
import com.google.android.exoplayer2.upstream.cache.Cache;
import com.google.android.exoplayer2.upstream.cache.CacheDataSink;
@ -60,7 +59,8 @@ public final class DownloaderConstructorHelper {
* @param upstreamFactory A {@link DataSource.Factory} for creating {@link DataSource}s for
* downloading data.
* @param cacheReadDataSourceFactory A {@link DataSource.Factory} for creating {@link DataSource}s
* for reading data from the cache. If null then a {@link FileDataSourceFactory} will be used.
* for reading data from the cache. If null then a {@link FileDataSource.Factory} will be
* used.
* @param cacheWriteDataSinkFactory A {@link DataSink.Factory} for creating {@link DataSource}s
* for writing data to the cache. If null then a {@link CacheDataSinkFactory} will be used.
* @param priorityTaskManager A {@link PriorityTaskManager} to use when downloading. If non-null,
@ -87,7 +87,8 @@ public final class DownloaderConstructorHelper {
* @param upstreamFactory A {@link DataSource.Factory} for creating {@link DataSource}s for
* downloading data.
* @param cacheReadDataSourceFactory A {@link DataSource.Factory} for creating {@link DataSource}s
* for reading data from the cache. If null then a {@link FileDataSourceFactory} will be used.
* for reading data from the cache. If null then a {@link FileDataSource.Factory} will be
* used.
* @param cacheWriteDataSinkFactory A {@link DataSink.Factory} for creating {@link DataSource}s
* for writing data to the cache. If null then a {@link CacheDataSinkFactory} will be used.
* @param priorityTaskManager A {@link PriorityTaskManager} to use when downloading. If non-null,

View file

@ -113,7 +113,6 @@ public final class DefaultDataSource implements DataSource {
context,
new DefaultHttpDataSource(
userAgent,
/* contentTypePredicate= */ null,
connectTimeoutMillis,
readTimeoutMillis,
allowCrossProtocolRedirects,

View file

@ -49,8 +49,8 @@ import java.util.zip.GZIPInputStream;
*
* <p>By default this implementation will not follow cross-protocol redirects (i.e. redirects from
* HTTP to HTTPS or vice versa). Cross-protocol redirects can be enabled by using the {@link
* #DefaultHttpDataSource(String, Predicate, int, int, boolean, RequestProperties)} constructor and
* passing {@code true} as the second last argument.
* #DefaultHttpDataSource(String, int, int, boolean, RequestProperties)} constructor and passing
* {@code true} for the {@code allowCrossProtocolRedirects} argument.
*
* <p>Note: HTTP request headers will be set using all parameters passed via (in order of decreasing
* priority) the {@code dataSpec}, {@link #setRequestProperty} and the default parameters used to
@ -171,6 +171,7 @@ public class DefaultHttpDataSource extends BaseDataSource implements HttpDataSou
* @deprecated Use {@link #DefaultHttpDataSource(String, int, int)} and {@link
* #setContentTypePredicate(Predicate)}.
*/
@SuppressWarnings("deprecation")
@Deprecated
public DefaultHttpDataSource(
String userAgent,