From d55b348e629d5ae5a2efbba6735be4b30220e50b Mon Sep 17 00:00:00 2001
From: Tingting Wang <tingtingw@google.com>
Date: Tue, 7 Jul 2015 16:58:13 -0700
Subject: [PATCH] Don't display Custom for PHONE_TYPE=CUSTOM part 1.

Dialer sometimes creates custom PHONE_TYPE values without
specifying the custom string. In this case, we shouldn't
display "Custom". We should display nothing.

BUG 21900262

Change-Id: I11aff369c76126a3f60f95aa589ae2a8a3e98bb1
---
 core/java/android/provider/ContactsContract.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 8ce1cbf43f7d5..d547a604eb8bc 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);