diff --git a/libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSource.java b/libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSource.java index 6a334c0ae1..74d863301f 100644 --- a/libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSource.java +++ b/libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSource.java @@ -432,130 +432,6 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource { private volatile long currentConnectTimeoutMs; - /** @deprecated Use {@link CronetDataSource.Factory} instead. */ - @SuppressWarnings("deprecation") - @Deprecated - public CronetDataSource(CronetEngine cronetEngine, Executor executor) { - this( - cronetEngine, - executor, - DEFAULT_CONNECT_TIMEOUT_MILLIS, - DEFAULT_READ_TIMEOUT_MILLIS, - /* resetTimeoutOnRedirects= */ false, - /* defaultRequestProperties= */ null); - } - - /** @deprecated Use {@link CronetDataSource.Factory} instead. */ - @Deprecated - public CronetDataSource( - CronetEngine cronetEngine, - Executor executor, - int connectTimeoutMs, - int readTimeoutMs, - boolean resetTimeoutOnRedirects, - @Nullable RequestProperties defaultRequestProperties) { - this( - cronetEngine, - executor, - REQUEST_PRIORITY_MEDIUM, - connectTimeoutMs, - readTimeoutMs, - resetTimeoutOnRedirects, - /* handleSetCookieRequests= */ false, - /* userAgent= */ null, - defaultRequestProperties, - /* contentTypePredicate= */ null, - /* keepPostFor302Redirects */ false); - } - - /** @deprecated Use {@link CronetDataSource.Factory} instead. */ - @Deprecated - public CronetDataSource( - CronetEngine cronetEngine, - Executor executor, - int connectTimeoutMs, - int readTimeoutMs, - boolean resetTimeoutOnRedirects, - @Nullable RequestProperties defaultRequestProperties, - boolean handleSetCookieRequests) { - this( - cronetEngine, - executor, - REQUEST_PRIORITY_MEDIUM, - connectTimeoutMs, - readTimeoutMs, - resetTimeoutOnRedirects, - handleSetCookieRequests, - /* userAgent= */ null, - defaultRequestProperties, - /* contentTypePredicate= */ null, - /* keepPostFor302Redirects */ false); - } - - /** @deprecated Use {@link CronetDataSource.Factory} instead. */ - @SuppressWarnings("deprecation") - @Deprecated - public CronetDataSource( - CronetEngine cronetEngine, - Executor executor, - @Nullable Predicate contentTypePredicate) { - this( - cronetEngine, - executor, - contentTypePredicate, - DEFAULT_CONNECT_TIMEOUT_MILLIS, - DEFAULT_READ_TIMEOUT_MILLIS, - /* resetTimeoutOnRedirects= */ false, - /* defaultRequestProperties= */ null); - } - - /** @deprecated Use {@link CronetDataSource.Factory} instead. */ - @SuppressWarnings("deprecation") - @Deprecated - public CronetDataSource( - CronetEngine cronetEngine, - Executor executor, - @Nullable Predicate contentTypePredicate, - int connectTimeoutMs, - int readTimeoutMs, - boolean resetTimeoutOnRedirects, - @Nullable RequestProperties defaultRequestProperties) { - this( - cronetEngine, - executor, - contentTypePredicate, - connectTimeoutMs, - readTimeoutMs, - resetTimeoutOnRedirects, - defaultRequestProperties, - /* handleSetCookieRequests= */ false); - } - - /** @deprecated Use {@link CronetDataSource.Factory} instead. */ - @Deprecated - public CronetDataSource( - CronetEngine cronetEngine, - Executor executor, - @Nullable Predicate contentTypePredicate, - int connectTimeoutMs, - int readTimeoutMs, - boolean resetTimeoutOnRedirects, - @Nullable RequestProperties defaultRequestProperties, - boolean handleSetCookieRequests) { - this( - cronetEngine, - executor, - REQUEST_PRIORITY_MEDIUM, - connectTimeoutMs, - readTimeoutMs, - resetTimeoutOnRedirects, - handleSetCookieRequests, - /* userAgent= */ null, - defaultRequestProperties, - contentTypePredicate, - /* keepPostFor302Redirects */ false); - } - protected CronetDataSource( CronetEngine cronetEngine, Executor executor, diff --git a/libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSourceFactory.java b/libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSourceFactory.java index d0a7d86574..b1a22e912e 100644 --- a/libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSourceFactory.java +++ b/libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSourceFactory.java @@ -15,6 +15,8 @@ */ package androidx.media3.datasource.cronet; +import static org.chromium.net.UrlRequest.Builder.REQUEST_PRIORITY_MEDIUM; + import androidx.annotation.Nullable; import androidx.media3.common.util.UnstableApi; import androidx.media3.datasource.DefaultHttpDataSource; @@ -346,10 +348,15 @@ public final class CronetDataSourceFactory extends BaseFactory { new CronetDataSource( cronetEngine, executor, + REQUEST_PRIORITY_MEDIUM, connectTimeoutMs, readTimeoutMs, resetTimeoutOnRedirects, - defaultRequestProperties); + /* handleSetCookieRequests= */ false, + /* userAgent= */ null, + defaultRequestProperties, + /* contentTypePredicate= */ null, + /* keepPostFor302Redirects */ false); if (transferListener != null) { dataSource.addTransferListener(transferListener); }