From 65d6ac1299720f8cc8e40cc8cc875fe3da2337dd Mon Sep 17 00:00:00 2001 From: Diogo Ferreira Date: Wed, 7 Sep 2016 17:44:31 +0100 Subject: SetupWizard: Don't show wifi setup on wifi-less devices Altough uncommon, development boards and emulators don't have a wireless interface. In those cases, don't show the wireless setup page. Change-Id: I0017b2277defdccf7f0bd61cb9606254509f78cc --- src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java | 4 +++- src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java b/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java index 03f4ffd..7a20c58 100644 --- a/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java +++ b/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java @@ -51,7 +51,9 @@ public class CMSetupWizardData extends AbstractSetupData { pages.add(new BluetoothSetupPage(mContext, this)); } pages.add(new WelcomePage(mContext, this)); - pages.add(new WifiSetupPage(mContext, this)); + if (SetupWizardUtils.hasWifi(mContext)) { + pages.add(new WifiSetupPage(mContext, this)); + } if (SetupWizardUtils.hasTelephony(mContext)) { pages.add(new SimCardMissingPage(mContext, this) .setHidden(isSimInserted())); diff --git a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java index b60449d..1b6a3ee 100644 --- a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java +++ b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java @@ -101,6 +101,11 @@ public class SetupWizardUtils { } } + public static boolean hasWifi(Context context) { + PackageManager packageManager = context.getPackageManager(); + return packageManager.hasSystemFeature(PackageManager.FEATURE_WIFI); + } + public static boolean hasTelephony(Context context) { PackageManager packageManager = context.getPackageManager(); return packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY); -- cgit v1.1