summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/sim
diff options
context:
space:
mode:
authorSanket Padawe <sanketpadawe@google.com>2015-01-06 10:54:55 -0800
committerSanket Padawe <sanketpadawe@google.com>2015-01-06 10:54:55 -0800
commit4d902bcc8fd679013d8ef96314aa7383d8f3ddf7 (patch)
tree6ae9eed5e9e99da2c13f02d52393925cff9ada2b /src/com/android/settings/sim
parentc3068f078887f3357b498a0851591c324d3c55d5 (diff)
downloadpackages_apps_Settings-4d902bcc8fd679013d8ef96314aa7383d8f3ddf7.zip
packages_apps_Settings-4d902bcc8fd679013d8ef96314aa7383d8f3ddf7.tar.gz
packages_apps_Settings-4d902bcc8fd679013d8ef96314aa7383d8f3ddf7.tar.bz2
Fixed crash caused by non-integer phoneAccountId in SimDialogActivity.
Bug: 18834691 Change-Id: I75b5ba4d72523474fe91eaf80f8201d9a53a683a
Diffstat (limited to 'src/com/android/settings/sim')
-rw-r--r--src/com/android/settings/sim/SimDialogActivity.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java
index 0964f10..3170dae 100644
--- a/src/com/android/settings/sim/SimDialogActivity.java
+++ b/src/com/android/settings/sim/SimDialogActivity.java
@@ -219,7 +219,10 @@ public class SimDialogActivity extends Activity {
final PhoneAccount phoneAccount =
telecomManager.getPhoneAccount(phoneAccounts.next());
list.add((String)phoneAccount.getLabel());
- if (phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
+ // Added check to add entry into callsSubInforList only if phoneAccountId is int
+ // Todo : Might have to change it later based on b/18904714
+ if (phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION) &&
+ TextUtils.isDigitsOnly(phoneAccount.getAccountHandle().getId())) {
final String phoneAccountId = phoneAccount.getAccountHandle().getId();
final SubscriptionInfo sir = Utils.findRecordBySubId(context,
Integer.parseInt(phoneAccountId));