PawletOS/lineageos_updater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updater: Drop usage of NetworkInfo

Browse Source 
- NetworkInfo is deprecated

Change-Id: I433bd5e89080931e9a2fdf1253d8e5f493ea2cbe
This commit is contained in:
althafvly
2022-10-25 11:15:06 +05:30
committed by Bruno Martins
parent e32b81fb3a
commit cdcb51197b
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/org/lineageos/updater/misc/Utils.java
View File

@@ -23,7 +23,8 @@ import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.NetworkInfo; import android.net.Network;
import android.net.NetworkCapabilities;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.storage.StorageManager; import android.os.storage.StorageManager;
import android.util.Log; import android.util.Log;
@@ -187,8 +188,18 @@ public class Utils {
public static boolean isNetworkAvailable(Context context) { public static boolean isNetworkAvailable(Context context) {
ConnectivityManager cm = context.getSystemService(ConnectivityManager.class); ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
NetworkInfo info = cm.getActiveNetworkInfo(); Network activeNetwork = cm.getActiveNetwork();
return !(info == null || !info.isConnected() || !info.isAvailable()); NetworkCapabilities networkCapabilities = cm.getNetworkCapabilities(activeNetwork);
if (networkCapabilities != null &&
networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)) {
return networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)
|| networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)
|| networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_USB)
|| networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN)
|| networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI);
}
return false;
} }
public static boolean isNetworkMetered(Context context) { public static boolean isNetworkMetered(Context context) {