diff options
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/ContactsContract.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 8ce1cbf43f7d..d547a604eb8b 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -5957,7 +5957,9 @@ public final class ContactsContract { */ public static final CharSequence getTypeLabel(Resources res, int type, CharSequence label) { - if ((type == TYPE_CUSTOM || type == TYPE_ASSISTANT) && !TextUtils.isEmpty(label)) { + if (type == TYPE_CUSTOM) { + return (label != null ? label : ""); + } else if (type == TYPE_ASSISTANT && !TextUtils.isEmpty(label)) { return label; } else { final int labelRes = getTypeLabelResource(type); |