From 2ec7da32280e840a7422823b24e124810d5c9a93 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Sat, 27 Apr 2024 15:28:04 +0100 Subject: [PATCH] SetupWizardUtils: Properly test for Ethernet transport presence NetworkCapabilities#hasCapability tests for the presence of a capability, not of a transport. Use the proper method to fix the Ethernet connectivity validation. Change-Id: I7e1828cca420e9a84080ede51807ab12ec9eedcb --- src/org/lineageos/setupwizard/util/SetupWizardUtils.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java index 1cfdfa42..3bd6b199 100644 --- a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java +++ b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java @@ -234,10 +234,8 @@ public class SetupWizardUtils { ConnectivityManager cm = (ConnectivityManager) context. getSystemService(Context.CONNECTIVITY_SERVICE); NetworkCapabilities networkCapabilities = cm.getNetworkCapabilities(cm.getActiveNetwork()); - if (networkCapabilities != null) { - return networkCapabilities.hasCapability(NetworkCapabilities.TRANSPORT_ETHERNET); - } - return false; + return networkCapabilities != null && + networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET); } public static boolean hasLeanback(Context context) {