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
3cf88bb4
authored
Jan 02, 2020
by
andrewlewis
Committed by
Oliver Woodman
Jan 17, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fix typos
PiperOrigin-RevId: 287810018
parent
3bce2138
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
extensions/okhttp/build.gradle
library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
extensions/okhttp/build.gradle
View file @
3cf88bb4
...
...
@@ -39,8 +39,8 @@ dependencies {
testImplementation
'org.robolectric:robolectric:'
+
robolectricVersion
// Do not update to 3.13.X or later until minSdkVersion is increased to 21:
// https://cashapp.github.io/2019-02-05/okhttp-3-13-requires-android-5
// Since OkHttp is distributed as a jar rather than an aar, Gradle won
t stop
// us from making this mistake!
// Since OkHttp is distributed as a jar rather than an aar, Gradle won
't
//
stop
us from making this mistake!
api
'com.squareup.okhttp3:okhttp:3.12.5'
}
...
...
library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
View file @
3cf88bb4
...
...
@@ -165,7 +165,7 @@ public final class Requirements implements Parcelable {
private
static
boolean
isInternetConnectivityValidated
(
ConnectivityManager
connectivityManager
)
{
// It's possible to query NetworkCapabilities from API level 23, but RequirementsWatcher only
// fires an event to update its Requirements when NetworkCapabilities change from API level 24.
// Since Requirements wont be updated, we assume connectivity is validated on API level 23.
// Since Requirements won
'
t be updated, we assume connectivity is validated on API level 23.
if
(
Util
.
SDK_INT
<
24
)
{
return
true
;
}
...
...
library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
View file @
3cf88bb4
...
...
@@ -204,7 +204,7 @@ public class SimpleCacheTest {
simpleCache
.
releaseHoleSpan
(
cacheSpan2
);
simpleCache
.
removeSpan
(
simpleCache
.
getCachedSpans
(
KEY_2
).
first
());
// Don't release the cache. This means the index file wont have been written to disk after the
// Don't release the cache. This means the index file won
'
t have been written to disk after the
// data for KEY_2 was removed. Move the cache instead, so we can reload it without failing the
// folder locking check.
File
cacheDir2
=
...
...
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