Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c9d75a7 authored by Sanket Padawe's avatar Sanket Padawe Committed by Android Git Automerger
Browse files

am be3b0c4e: Merge "Fixed crash caused by non-integer phoneAccountId in... 

am be3b0c4e: Merge "Fixed crash caused by non-integer phoneAccountId in SimDialogActivity." into lmp-mr1-dev

* commit 'be3b0c4e':
  Fixed crash caused by non-integer phoneAccountId in SimDialogActivity.
parents 43bdc5cd be3b0c4e

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

+4 −1
Original line number Diff line number Diff line
@@ -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));