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

SetupWizardUtils: Check if active Ethernet network reaches the Internet

Browse Source 
Extend the current Ethernet connectivity validation to check
if network is active (can receive and send data).

Change-Id: I1017df7740000774acc713a419c8572ee4ea588f
This commit is contained in:
Bruno Martins
2024-04-27 15:49:48 +01:00
parent 2ec7da3228
commit 5dd3549573
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/org/lineageos/setupwizard/util/SetupWizardUtils.java
View File

@@ -230,12 +230,13 @@ public class SetupWizardUtils {
return SystemProperties.getBoolean("config.disable_bluetooth", false); return SystemProperties.getBoolean("config.disable_bluetooth", false);
} }
public static boolean isEthernetConnected(Context context) { private static boolean isNetworkConnectedToInternetViaEthernet(Context context) {
ConnectivityManager cm = (ConnectivityManager) context. ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkCapabilities networkCapabilities = cm.getNetworkCapabilities(cm.getActiveNetwork()); NetworkCapabilities networkCapabilities = cm.getNetworkCapabilities(cm.getActiveNetwork());
return networkCapabilities != null && return networkCapabilities != null &&
networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET); networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) &&
networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
} }
public static boolean hasLeanback(Context context) { public static boolean hasLeanback(Context context) {
@@ -266,7 +267,8 @@ public class SetupWizardUtils {
if (!hasTelephony(context) || !simMissing(context)) { if (!hasTelephony(context) || !simMissing(context)) {
disableComponent(context, SimMissingActivity.class); disableComponent(context, SimMissingActivity.class);
} }
if ((!hasWifi(context) && !hasTelephony(context)) || isEthernetConnected(context)) { if ((!hasWifi(context) && !hasTelephony(context)) ||
isNetworkConnectedToInternetViaEthernet(context)) {
disableComponent(context, NetworkSetupActivity.class); disableComponent(context, NetworkSetupActivity.class);
} }
} }