loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-07 23:50:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix API level 16 method use without guard and refactoring

Browse Source 
For below API level 16, the logic copied from ConnectivityManagerCompat.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=184131406
This commit is contained in:
eguven 2018-02-01 06:23:11 -08:00 committed by Andrew Lewis
parent 61ba0f2827
commit a075b23893
1 changed files with 50 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
library/core/src/main/java/com/google/android/exoplayer2/util/scheduler/Requirements.java
View File

@ -141,45 +141,27 @@ public final class Requirements {
if (networkInfo == null || !networkInfo.isConnected()) { if (networkInfo == null || !networkInfo.isConnected()) {
logd("No network info or no connection."); logd("No network info or no connection.");
return false; return false;
} else if (Util.SDK_INT >= 23) {
// TODO Check internet connectivity using http://clients3.google.com/generate_204 on API
// levels prior to 23.
Network activeNetwork = connectivityManager.getActiveNetwork();
if (activeNetwork == null) {
logd("No active network.");
return false;
}
NetworkCapabilities networkCapabilities =
connectivityManager.getNetworkCapabilities(activeNetwork);
if (networkCapabilities == null
|| !networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)) {
logd("Net capability isn't validated.");
return false;
}
} }
boolean activeNetworkMetered = connectivityManager.isActiveNetworkMetered(); if (!checkInternetConnectivity(connectivityManager)) {
switch (networkRequirement) { return false;
case NETWORK_TYPE_ANY:
return true;
case NETWORK_TYPE_UNMETERED:
if (activeNetworkMetered) {
logd("Network is metered.");
}
return !activeNetworkMetered;
case NETWORK_TYPE_NOT_ROAMING:
boolean roaming = networkInfo.isRoaming();
if (roaming) {
logd("Roaming.");
}
return !roaming;
case NETWORK_TYPE_METERED:
if (!activeNetworkMetered) {
logd("Network isn't metered.");
}
return activeNetworkMetered;
default:
throw new IllegalStateException();
} }
if (networkRequirement == NETWORK_TYPE_ANY) {
return true;
}
if (networkRequirement == NETWORK_TYPE_NOT_ROAMING) {
boolean roaming = networkInfo.isRoaming();
logd("Roaming: " + roaming);
return !roaming;
}
boolean activeNetworkMetered = isActiveNetworkMetered(connectivityManager, networkInfo);
logd("Metered network: " + activeNetworkMetered);
if (networkRequirement == NETWORK_TYPE_UNMETERED) {
return !activeNetworkMetered;
}
if (networkRequirement == NETWORK_TYPE_METERED) {
return activeNetworkMetered;
}
throw new IllegalStateException();
} }
private boolean checkChargingRequirement(Context context) { private boolean checkChargingRequirement(Context context) {
@ -206,6 +188,37 @@ public final class Requirements {
: Util.SDK_INT >= 20 ? !powerManager.isInteractive() : !powerManager.isScreenOn(); : Util.SDK_INT >= 20 ? !powerManager.isInteractive() : !powerManager.isScreenOn();
} }
private static boolean checkInternetConnectivity(ConnectivityManager connectivityManager) {
if (Util.SDK_INT < 23) {
// TODO Check internet connectivity using http://clients3.google.com/generate_204 on API
// levels prior to 23.
return true;
}
Network activeNetwork = connectivityManager.getActiveNetwork();
if (activeNetwork == null) {
logd("No active network.");
return false;
}
NetworkCapabilities networkCapabilities =
connectivityManager.getNetworkCapabilities(activeNetwork);
boolean validated =
networkCapabilities == null
|| !networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
logd("Network capability validated: " + validated);
return !validated;
}
private static boolean isActiveNetworkMetered(
ConnectivityManager connectivityManager, NetworkInfo networkInfo) {
if (Util.SDK_INT >= 16) {
return connectivityManager.isActiveNetworkMetered();
}
int type = networkInfo.getType();
return type != ConnectivityManager.TYPE_WIFI
&& type != ConnectivityManager.TYPE_BLUETOOTH
&& type != ConnectivityManager.TYPE_ETHERNET;
}
private static void logd(String message) { private static void logd(String message) {
if (Scheduler.DEBUG) { if (Scheduler.DEBUG) {
Log.d(TAG, message); Log.d(TAG, message);