SetupWizard: don't access SubscriptionController directly

SubscriptionController exists in the telephony process and cannot
be accessed by SetupWizard.

getInstance() will always return null.

Change-Id: I017682d3aad539e1954348664b1c1fec7f76009d

1 files changed, 6 insertions, 11 deletions

diff --git a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java
index 1aeda14..d201080 100644
--- a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java
+++ b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java
@@ -32,8 +32,6 @@ import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
-import com.android.internal.telephony.SubscriptionController;
-
 import com.cyanogenmod.setupwizard.SetupWizardApp;
 
 import com.google.android.gms.common.ConnectionResult;
@@ -115,15 +113,12 @@ public class SetupWizardUtils {
     public static boolean isSimMissing(Context context) {
         TelephonyManager tm =
                 (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-        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;
-                }
+        int simCount = SubscriptionManager.from(context).getDefaultDataPhoneId();
+        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;