Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
d6a6cbf8
authored
Feb 08, 2022
by
ibaker
Committed by
Ian Baker
Feb 21, 2022
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Remove deprecated CronetDataSource constructors
#minor-release PiperOrigin-RevId: 427216911
parent
d718d964
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
125 deletions
libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSource.java
libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSourceFactory.java
libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSource.java
View file @
d6a6cbf8
...
...
@@ -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
<
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
(
CronetEngine
cronetEngine
,
Executor
executor
,
...
...
libraries/datasource_cronet/src/main/java/androidx/media3/datasource/cronet/CronetDataSourceFactory.java
View file @
d6a6cbf8
...
...
@@ -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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment