commit 93c345f6ddbd4b08ac9eedd4bbc68b0c8ef63a4e
author Andrew Lee <anwlee@google.com> Mon Oct 27 15:25:07 2014 -0700
committer Andrew Lee <anwlee@google.com> Mon Oct 27 15:45:53 2014 -0700
tree afe790bb03cf9c045b5af4a0f99dbc901e457ea5
parent 8f5f812ddf4e4f21631c9b79f494423600e2931b

Hide account settings in call settings if multiple SIMs.

Account settings will be launched from Dialer now.

Bug: 18114923
Change-Id: I33062007937f7e83c278004d522948452d5ffc8f

src/com/android/phone/CallFeaturesSetting.java

diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index 7c828f9..c1e1a7f 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -50,6 +50,7 @@
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.telephony.PhoneNumberUtils;
+import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.MenuItem;
@@ -1526,10 +1527,11 @@
         mPhoneAccountSettingsPreference = findPreference(PHONE_ACCOUNT_SETTINGS_KEY);
 
         TelecomManager telecomManager = TelecomManager.from(this);
+        TelephonyManager telephonyManager =
+                (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
 
-        if (telecomManager.getAllPhoneAccountsCount() <= 1
-                && telecomManager.getSimCallManagers().isEmpty()
-                && !SipUtil.isVoipSupported(this)) {
+        if ((telecomManager.getSimCallManagers().isEmpty() && !SipUtil.isVoipSupported(this))
+                || telephonyManager.getPhoneCount() > 1) {
             getPreferenceScreen().removePreference(mPhoneAccountSettingsPreference);
         }
     }