From 98b5eb9958c96cc634c964bebc3401c9bcebff73 Mon Sep 17 00:00:00 2001 From: Roman Birg Date: Thu, 26 Mar 2015 03:44:35 -0700 Subject: [PATCH] SetupWizard: don't crash without SIMs SubscriptionManager may be null Change-Id: Ia2112044400576a93931474a3fff2af161ccda21 Signed-off-by: Roman Birg --- .../setupwizard/util/SetupWizardUtils.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java index a1602ae..bd6bd45 100644 --- a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java +++ b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java @@ -113,12 +113,15 @@ public class SetupWizardUtils { public static boolean isSimMissing(Context context) { TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); - int simCount = SubscriptionController.getInstance().getActiveSubInfoCount(); - for (int i = 0; i < simCount; i++) { - int simState = tm.getSimState(i); - if (simState != TelephonyManager.SIM_STATE_ABSENT && - simState != TelephonyManager.SIM_STATE_UNKNOWN) { - return false; + SubscriptionController subscriptionController = SubscriptionController.getInstance(); + if (subscriptionController != null) { + int simCount = subscriptionController.getActiveSubInfoCount(); + for (int i = 0; i < simCount; i++) { + int simState = tm.getSimState(i); + if (simState != TelephonyManager.SIM_STATE_ABSENT && + simState != TelephonyManager.SIM_STATE_UNKNOWN) { + return false; + } } } return true;