diff options
| author | Sanket Padawe <sanketpadawe@google.com> | 2015-01-06 21:02:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-06 21:02:23 +0000 |
| commit | f04bf1c32261b3094837ecf1d95e786caa2a0330 (patch) | |
| tree | acff6e384ce4e074cf929f8294bfe8ba0ffbfe53 /src/com/android/settings/sim | |
| parent | c8c82f002d8ed828186393023cbea163cd0914ea (diff) | |
| parent | 310b533689ac9ecd6ee3e9abbd4029882522358f (diff) | |
| download | packages_apps_Settings-f04bf1c32261b3094837ecf1d95e786caa2a0330.zip packages_apps_Settings-f04bf1c32261b3094837ecf1d95e786caa2a0330.tar.gz packages_apps_Settings-f04bf1c32261b3094837ecf1d95e786caa2a0330.tar.bz2 | |
am 310b5336: am 2c9d75a7: am be3b0c4e: Merge "Fixed crash caused by non-integer phoneAccountId in SimDialogActivity." into lmp-mr1-dev
* commit '310b533689ac9ecd6ee3e9abbd4029882522358f':
Fixed crash caused by non-integer phoneAccountId in SimDialogActivity.
Diffstat (limited to 'src/com/android/settings/sim')
| -rw-r--r-- | src/com/android/settings/sim/SimDialogActivity.java | 5 |
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)); |