commit bd47e070699fe1dca4db6a700e80833946b6445c
author Sanket Padawe <sanketpadawe@google.com> Tue Jan 06 10:54:55 2015 -0800
committer The Android Automerger <android-build@google.com> Tue Jan 06 14:23:50 2015 -0800
tree 2af965bb105cda67700b44705188cd48c4319a5f
parent 9949409cdc47dc660562fbdebf97d974cf13f45c

Fixed crash caused by non-integer phoneAccountId in SimDialogActivity.

Bug: 18834691
Change-Id: I75b5ba4d72523474fe91eaf80f8201d9a53a683a

src/com/android/settings/sim/SimDialogActivity.java

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 @@
                 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));