Rework isMultiSimDevice check

Move it to PhoneMonitor to be consistent with other checks

Change-Id: I560048ebdf318a92747a70ffb6fa8027b4589c1a

2 files changed, 9 insertions, 7 deletions

diff --git a/src/com/aicp/setupwizard/util/PhoneMonitor.java b/src/com/aicp/setupwizard/util/PhoneMonitor.java
index 369e7a0..5ea89f2 100644
--- a/src/com/aicp/setupwizard/util/PhoneMonitor.java
+++ b/src/com/aicp/setupwizard/util/PhoneMonitor.java
@@ -301,6 +301,10 @@ public class PhoneMonitor {
         return simSlotCount == mSubscriptionManager.getActiveSubscriptionInfoCount();
     }
 
+    public boolean isMultiSimDevice() {
+        return mTelephony.isMultiSimEnabled();
+    }
+
     public boolean isGSM(int subId) {
         return mTelephony.createForSubscriptionId(subId).getCurrentPhoneType() == PHONE_TYPE_GSM;
     }
diff --git a/src/com/aicp/setupwizard/util/SetupWizardUtils.java b/src/com/aicp/setupwizard/util/SetupWizardUtils.java
index 297c0e7..f925dc4 100644
--- a/src/com/aicp/setupwizard/util/SetupWizardUtils.java
+++ b/src/com/aicp/setupwizard/util/SetupWizardUtils.java
@@ -141,12 +141,6 @@ public class SetupWizardUtils {
         return !featureHidden;
     }
 
-    public static boolean isMultiSimDevice(Context context) {
-        TelephonyManager tm =
-                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-        return tm.isMultiSimEnabled();
-    }
-
     public static boolean isRadioReady(Context context, ServiceState state) {
         final SetupWizardApp setupWizardApp = (SetupWizardApp) context.getApplicationContext();
         if (setupWizardApp.isRadioReady()) {
@@ -281,6 +275,10 @@ public class SetupWizardUtils {
         return PhoneMonitor.getInstance().simMissing();
     }
 
+    public static boolean isMultiSimDevice() {
+        return PhoneMonitor.getInstance().isMultiSimDevice();
+    }
+
     public static void disableComponentsForMissingFeatures(Context context) {
         if (!hasLeanback(context)) {
             disableComponent(context, BluetoothSetupActivity.class);
@@ -295,7 +293,7 @@ public class SetupWizardUtils {
         } else if (!simMissing()) {
             disableComponent(context, SimMissingActivity.class);
         }
-        if (!SetupWizardUtils.isMultiSimDevice(context)) {
+        if (!isMultiSimDevice()) {
             disableComponent(context, ChooseDataSimActivity.class);
         }
         if (!SetupWizardUtils.hasWifi(context) ||