diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-11-20 22:48:24 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-11-20 22:48:24 -0800 |
| commit | 663f0cbb201ff66efd042156c96328a99c179ed2 (patch) | |
| tree | 5c578c536aa51040cf7c314e9768f0a9419c12ce | |
| parent | 0eb93ba3d00b38b2d1ed78ef176a08098d989148 (diff) | |
| parent | 8be6d3d0ce71e4dc8871cf34ed77b9894d63adec (diff) | |
| download | android_packages_apps_ContactsCommon-663f0cbb201ff66efd042156c96328a99c179ed2.tar.gz android_packages_apps_ContactsCommon-663f0cbb201ff66efd042156c96328a99c179ed2.tar.bz2 android_packages_apps_ContactsCommon-663f0cbb201ff66efd042156c96328a99c179ed2.zip | |
Merge "ContactsCommon: Contacts force close once during Monkey test"
| -rw-r--r-- | src/com/android/contacts/common/util/TelephonyManagerUtils.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/contacts/common/util/TelephonyManagerUtils.java b/src/com/android/contacts/common/util/TelephonyManagerUtils.java index 01232859..5f9b062d 100644 --- a/src/com/android/contacts/common/util/TelephonyManagerUtils.java +++ b/src/com/android/contacts/common/util/TelephonyManagerUtils.java @@ -128,7 +128,8 @@ public class TelephonyManagerUtils { List<PhoneAccountHandle> pHandles = telecomManager.getCallCapablePhoneAccounts(); PhoneAccountHandle phoneAccountHandle = null; for (PhoneAccountHandle itorator : pHandles) { - if (String.valueOf(subId[0]).equals(itorator.getId())) { + if (subId != null + && String.valueOf(subId[0]).equals(itorator.getId())) { phoneAccountHandle = itorator; } } |