From 4d902bcc8fd679013d8ef96314aa7383d8f3ddf7 Mon Sep 17 00:00:00 2001
From: Sanket Padawe <sanketpadawe@google.com>
Date: Tue, 6 Jan 2015 10:54:55 -0800
Subject: [PATCH] Fixed crash caused by non-integer phoneAccountId in
 SimDialogActivity.

Bug: 18834691
Change-Id: I75b5ba4d72523474fe91eaf80f8201d9a53a683a
---
 src/com/android/settings/sim/SimDialogActivity.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java
index 0964f109193..3170daed6e4 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));