Merge branch 'cm-13.0' of https://github.com/LineageOS/android_packages_apps_Settings into replicant-6.0

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

1 files changed, 7 insertions, 2 deletions

diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index b97ee03..c5d3822 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -45,6 +45,7 @@ import android.telephony.SmsManager;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.text.TextUtils;
@@ -288,15 +289,19 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
     private void updateCallValues() {
         final Preference simPref = findPreference(KEY_CALLS);
         final TelecomManager telecomManager = TelecomManager.from(mContext);
-        final PhoneAccountHandle phoneAccount =
+        final PhoneAccountHandle phoneAccountHandle =
             telecomManager.getUserSelectedOutgoingPhoneAccount();
         final List<PhoneAccountHandle> allPhoneAccounts =
             telecomManager.getCallCapablePhoneAccounts();
 
         simPref.setTitle(R.string.calls_title);
+        PhoneAccount phoneAccount = null;
+        if (phoneAccountHandle != null) {
+            phoneAccount = telecomManager.getPhoneAccount(phoneAccountHandle);
+        }
         simPref.setSummary(phoneAccount == null
                 ? mContext.getResources().getString(R.string.sim_calls_ask_first_prefs_title)
-                : (String)telecomManager.getPhoneAccount(phoneAccount).getLabel());
+                : (String)phoneAccount.getLabel());
         simPref.setEnabled(allPhoneAccounts.size() > 1);
     }