From 86ac2281437838d1f09a5140543912194151ea1f Mon Sep 17 00:00:00 2001
From: Tingting Wang <tingtingw@google.com>
Date: Thu, 16 Jul 2015 21:19:28 +0000
Subject: [PATCH] Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."

This reverts commit d55b348e629d5ae5a2efbba6735be4b30220e50b.

Change-Id: I3e623de725c419489294aed6c3b3aea838fc0f7b
---
 core/java/android/provider/ContactsContract.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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