diff options
| author | Tingting Wang <tingtingw@google.com> | 2015-07-17 18:30:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-17 18:30:56 +0000 |
| commit | 6aee4761a826c3ef2793dc5c62d2451bd7450c61 (patch) | |
| tree | ab3eec73a233f1c0fce71bb936818af0fc4ab1e7 /core/java | |
| parent | 098a88e6a330c123c3daeda334e91c8656ecb4b2 (diff) | |
| parent | ad359f2e705280e26198890a95d53e3566126bcc (diff) | |
am ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev
* commit 'ad359f2e705280e26198890a95d53e3566126bcc':
Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/ContactsContract.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index d547a604eb8b..8ce1cbf43f7d 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -5957,9 +5957,7 @@ public final class ContactsContract { */ public static final CharSequence getTypeLabel(Resources res, int type, CharSequence label) { - if (type == TYPE_CUSTOM) { - return (label != null ? label : ""); - } else if (type == TYPE_ASSISTANT && !TextUtils.isEmpty(label)) { + if ((type == TYPE_CUSTOM || type == TYPE_ASSISTANT) && !TextUtils.isEmpty(label)) { return label; } else { final int labelRes = getTypeLabelResource(type); |