diff options
| author | blunden <blunden2@gmail.com> | 2014-11-23 14:32:48 +0100 |
|---|---|---|
| committer | blunden <blunden2@gmail.com> | 2014-11-23 14:32:48 +0100 |
| commit | 74ffb3d6f30dfa1a5e82bb936ea2e4171b14516e (patch) | |
| tree | 58490e90800c6d57f946ed1123d1a56f126fdf06 | |
| parent | be9c40e84d5a0fb2ea7353eb2d184680629fa762 (diff) | |
| download | android_packages_apps_ContactsCommon-74ffb3d6f30dfa1a5e82bb936ea2e4171b14516e.tar.gz android_packages_apps_ContactsCommon-74ffb3d6f30dfa1a5e82bb936ea2e4171b14516e.tar.bz2 android_packages_apps_ContactsCommon-74ffb3d6f30dfa1a5e82bb936ea2e4171b14516e.zip | |
Prevent NPE in Contacts when subId is null
Change-Id: I68f9f1be0b60b6d555f158d6cc37ed2b72b9ac2b
| -rw-r--r-- | src/com/android/contacts/common/util/TelephonyManagerUtils.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/contacts/common/util/TelephonyManagerUtils.java b/src/com/android/contacts/common/util/TelephonyManagerUtils.java index 01232859..1334bec6 100644 --- a/src/com/android/contacts/common/util/TelephonyManagerUtils.java +++ b/src/com/android/contacts/common/util/TelephonyManagerUtils.java @@ -123,6 +123,9 @@ public class TelephonyManagerUtils { } long subId[] = SubscriptionManager.getSubId(subscription); + if (subId == null) { + return null; + } final TelecomManager telecomManager = (TelecomManager) context .getSystemService(Context.TELECOM_SERVICE); List<PhoneAccountHandle> pHandles = telecomManager.getCallCapablePhoneAccounts(); |