sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reintroduce isConnected check for download requirements

Browse source 
PiperOrigin-RevId: 314925639
This commit is contained in:
olly 2020-06-05 15:37:49 +01:00 committed by Oliver Woodman
parent cdb4025758
commit 46d29b25c9
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
View file

@ -131,7 +131,10 @@ public final class Requirements implements Parcelable {
ConnectivityManager connectivityManager = ConnectivityManager connectivityManager =
(ConnectivityManager) (ConnectivityManager)
Assertions.checkNotNull(context.getSystemService(Context.CONNECTIVITY_SERVICE)); Assertions.checkNotNull(context.getSystemService(Context.CONNECTIVITY_SERVICE));
if (!isInternetConnectivityValidated(connectivityManager)) { @Nullable NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
if (networkInfo == null
|| !networkInfo.isConnected()
|| !isInternetConnectivityValidated(connectivityManager)) {
return requirements & (NETWORK | NETWORK_UNMETERED); return requirements & (NETWORK | NETWORK_UNMETERED);
} }
@ -164,11 +167,10 @@ public final class Requirements implements Parcelable {
private static boolean isInternetConnectivityValidated(ConnectivityManager connectivityManager) { private static boolean isInternetConnectivityValidated(ConnectivityManager connectivityManager) {
// It's possible to check NetworkCapabilities.NET_CAPABILITY_VALIDATED from API level 23, but // It's possible to check NetworkCapabilities.NET_CAPABILITY_VALIDATED from API level 23, but
// RequirementsWatcher only fires an event to re-check the requirements when NetworkCapabilities // RequirementsWatcher only fires an event to re-check the requirements when NetworkCapabilities
// change from API level 24. We use the legacy path for API level 23 here to keep in sync. // change from API level 24. We assume that network capability is validated for API level 23 to
// keep in sync.
if (Util.SDK_INT < 24) { if (Util.SDK_INT < 24) {
// Legacy path. return true;
@Nullable NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
return networkInfo != null && networkInfo.isConnected();
} }
@Nullable Network activeNetwork = connectivityManager.getActiveNetwork(); @Nullable Network activeNetwork = connectivityManager.getActiveNetwork();