Skip to content

SDK / exoplayer

Go to a project
Commit d6a6cbf8 by ibaker Committed by Ian Baker
Options

Remove deprecated CronetDataSource constructors 

#minor-release

PiperOrigin-RevId: 427216911
parent d718d964
Inline Side-by-side
Showing with 8 additions and 125 deletions
libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSource.java
...@@ -432,130 +432,6 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource { ...@@ -432,130 +432,6 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
private volatile long currentConnectTimeoutMs; 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<String> 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<String> 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<String> 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( protected CronetDataSource(
CronetEngine cronetEngine, CronetEngine cronetEngine,
Executor executor, Executor executor,
......
libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSourceFactory.java
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
*/ */
package androidx.media3.datasource.cronet; package androidx.media3.datasource.cronet;
import static org.chromium.net.UrlRequest.Builder.REQUEST_PRIORITY_MEDIUM;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.UnstableApi;
import androidx.media3.datasource.DefaultHttpDataSource; import androidx.media3.datasource.DefaultHttpDataSource;
...@@ -346,10 +348,15 @@ public final class CronetDataSourceFactory extends BaseFactory { ...@@ -346,10 +348,15 @@ public final class CronetDataSourceFactory extends BaseFactory {
new CronetDataSource( new CronetDataSource(
cronetEngine, cronetEngine,
executor, executor,
REQUEST_PRIORITY_MEDIUM,
connectTimeoutMs, connectTimeoutMs,
readTimeoutMs, readTimeoutMs,
resetTimeoutOnRedirects, resetTimeoutOnRedirects,
defaultRequestProperties); /* handleSetCookieRequests= */ false,
/* userAgent= */ null,
defaultRequestProperties,
/* contentTypePredicate= */ null,
/* keepPostFor302Redirects */ false);
if (transferListener != null) { if (transferListener != null) {
dataSource.addTransferListener(transferListener); dataSource.addTransferListener(transferListener);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment