commit 5e1938960b6d590f3806cbdd61bf4b39f1e91f16
author Andrew Lee <anwlee@google.com> Thu Jun 18 20:24:45 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 18 20:24:45 2015 +0000
tree 5d03d6385d1411b56b03387c0f71e982c69aa2c8
parent b67f24eb6229ea10afb83f8ef2bf2bc6ba29a8f6
parent c683c795aa43c343da972b36a940b9cfbada6775

Merge "Do not set type label if "Custom"." into mnc-dev

src/com/android/dialer/PhoneCallDetailsHelper.java

diff --git a/src/com/android/dialer/PhoneCallDetailsHelper.java b/src/com/android/dialer/PhoneCallDetailsHelper.java
index 68b47af..672a1c8 100644
--- a/src/com/android/dialer/PhoneCallDetailsHelper.java
+++ b/src/com/android/dialer/PhoneCallDetailsHelper.java
@@ -183,7 +183,9 @@
 
             if (TextUtils.isEmpty(details.name) && !TextUtils.isEmpty(details.geocode)) {
                 numberFormattedLabel = details.geocode;
-            } else {
+            } else if (!(details.numberType == Phone.TYPE_CUSTOM
+                    && TextUtils.isEmpty(details.numberLabel))) {
+                // Get type label only if it will not be "Custom" because of an empty number label.
                 numberFormattedLabel = Phone.getTypeLabel(
                         mResources, details.numberType, details.numberLabel);
             }