From 6971663571fe5ff109f87a7a06a00bb7c91c1a59 Mon Sep 17 00:00:00 2001 From: TheScarastic Date: Fri, 9 Jun 2017 14:11:03 +0000 Subject: [PATCH] SetupWizard: Fix crash when sims are absent Change-Id: I3e37f78f1c96be1630ea9fde866ce978f9ecf1d8 --- src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java index 7209b805..d98aef83 100644 --- a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java +++ b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java @@ -219,6 +219,10 @@ public class SetupWizardUtils { return fingerprintManager.isHardwareDetected(); } + public static boolean simMissing() { + return PhoneMonitor.getInstance().simMissing(); + } + public static String getDefaultThemePackageName(Context context) { final String defaultThemePkg = CMSettings.Secure.getString(context.getContentResolver(), CMSettings.Secure.DEFAULT_THEME_PACKAGE); @@ -248,6 +252,9 @@ public class SetupWizardUtils { disableComponent(context, ChooseDataSimActivity.class); } else if (!SetupWizardUtils.isMultiSimDevice(context)) { disableComponent(context, ChooseDataSimActivity.class); + } else if (simMissing()) { + disableComponent(context, MobileDataActivity.class); + disableComponent(context, ChooseDataSimActivity.class); } if (!SetupWizardUtils.hasWifi(context)) { disableComponent(context, WifiSetupActivity.class);