commit 3e6c02605472024247068c095f081439ab2893af
author Andrew Lee <anwlee@google.com> Tue Oct 28 18:43:14 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 28 18:43:14 2014 +0000
tree a9adf4d0a8e711aa9cbd4cabc2e74626f8fc9363
parent 1717fdd2d06ba4657bdd479f513022d10f44679c
parent 93c345f6ddbd4b08ac9eedd4bbc68b0c8ef63a4e

Merge "Hide account settings in call settings if multiple SIMs." into lmp-mr1-dev

src/com/android/phone/CallFeaturesSetting.java

diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index fff7153..b7f2d55 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;
@@ -1442,10 +1443,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);
         }
     }