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
ad699b8f
authored
Aug 27, 2019
by
olly
Committed by
Oliver Woodman
Sep 02, 2019
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
seenCacheError should be set for all errors
PiperOrigin-RevId: 265662686
parent
c3d6be3a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
View file @
ad699b8f
...
...
@@ -283,7 +283,7 @@ public final class CacheDataSource implements DataSource {
}
openNextSource
(
false
);
return
bytesRemaining
;
}
catch
(
IOException
e
)
{
}
catch
(
Throwable
e
)
{
handleBeforeThrow
(
e
);
throw
e
;
}
...
...
@@ -325,6 +325,9 @@ public final class CacheDataSource implements DataSource {
}
handleBeforeThrow
(
e
);
throw
e
;
}
catch
(
Throwable
e
)
{
handleBeforeThrow
(
e
);
throw
e
;
}
}
...
...
@@ -349,7 +352,7 @@ public final class CacheDataSource implements DataSource {
notifyBytesRead
();
try
{
closeCurrentSource
();
}
catch
(
IOException
e
)
{
}
catch
(
Throwable
e
)
{
handleBeforeThrow
(
e
);
throw
e
;
}
...
...
@@ -516,7 +519,7 @@ public final class CacheDataSource implements DataSource {
}
}
private
void
handleBeforeThrow
(
IOException
exception
)
{
private
void
handleBeforeThrow
(
Throwable
exception
)
{
if
(
isReadingFromCache
()
||
exception
instanceof
CacheException
)
{
seenCacheError
=
true
;
}
...
...
library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
View file @
ad699b8f
...
...
@@ -359,7 +359,7 @@ public final class CacheUtil {
}
}
/*
package
*/
static
boolean
isCausedByPositionOutOfRange
(
IOException
e
)
{
/*
package
*/
static
boolean
isCausedByPositionOutOfRange
(
IOException
e
)
{
Throwable
cause
=
e
;
while
(
cause
!=
null
)
{
if
(
cause
instanceof
DataSourceException
)
{
...
...
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